git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
intel_cacheinfo.c
diff --git
a/arch/x86/kernel/cpu/intel_cacheinfo.c
b/arch/x86/kernel/cpu/intel_cacheinfo.c
index
eddb1bd
..
95962a9
100644
(file)
--- a/
arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/
arch/x86/kernel/cpu/intel_cacheinfo.c
@@
-340,6
+340,10
@@
amd_check_l3_disable(int index, struct _cpuid4_info_regs *this_leaf)
(boot_cpu_data.x86_mask < 0x1)))
return;
(boot_cpu_data.x86_mask < 0x1)))
return;
+ /* not in virtualized environments */
+ if (num_k8_northbridges == 0)
+ return;
+
this_leaf->can_disable = true;
this_leaf->l3_indices = amd_calc_l3_indices();
}
this_leaf->can_disable = true;
this_leaf->l3_indices = amd_calc_l3_indices();
}
@@
-903,7
+907,7
@@
static ssize_t store(struct kobject *kobj, struct attribute *attr,
return ret;
}
return ret;
}
-static struct sysfs_ops sysfs_ops = {
+static
const
struct sysfs_ops sysfs_ops = {
.show = show,
.store = store,
};
.show = show,
.store = store,
};