---

yaml --- r: 234019 b: refs/heads/master c: 36e8695 h: refs/heads/master i: 234017: eaeb119 234015: 098f725 v: v3
git-mirror · Mar 9, 2011 · 10de3b7 · 10de3b7
1 parent 5e6e5dc
commit 10de3b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2f6dad6ca3b06ae35a2e7b63f38158242c01531
+refs/heads/master: 36e8695ca5dcf48c837a6efe6f780c47ac9ec808
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
@@ -1516,7 +1516,8 @@ int start_topology_update(void)
 {
 	int rc = 0;
 
-	if (firmware_has_feature(FW_FEATURE_VPHN) &&
+	/* Disabled until races with load balancing are fixed */
+	if (0 && firmware_has_feature(FW_FEATURE_VPHN) &&
 	    get_lppaca()->shared_proc) {
 		vphn_enabled = 1;
 		setup_cpu_associativity_change_counters();