---

yaml --- r: 191485 b: refs/heads/master c: f2b20e4 h: refs/heads/master i: 191483: 7112cf4 v: v3
git-mirror · Apr 23, 2010 · 5221f50 · 5221f50
1 parent 57d4b0d
commit 5221f50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1ab1b4d9ab9812c77843abec79030292ef0a544
+refs/heads/master: f2b20e41407fccfcfacf927ff91ec888832a37af
diff --git a/trunk/arch/x86/kernel/cpu/intel_cacheinfo.c b/trunk/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -344,6 +344,10 @@ amd_check_l3_disable(int index, struct _cpuid4_info_regs *this_leaf)
 	     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();
 }