---

yaml --- r: 370802 b: refs/heads/master c: b7abef0 h: refs/heads/master v: v3
git-mirror · Apr 26, 2013 · 72f956d · 72f956d
1 parent a3456b1
commit 72f956d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 176bbf142461a000901df4ec6b8fac04969dd4e5
+refs/heads/master: b7abef045fdacdb40eef7f22ebbb566d63f9f240
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
@@ -1572,9 +1572,8 @@ int start_topology_update(void)
 			vphn_enabled = 0;
 			rc = of_reconfig_notifier_register(&dt_update_nb);
 		}
-	} else if (0 && firmware_has_feature(FW_FEATURE_VPHN) &&
+	} else if (firmware_has_feature(FW_FEATURE_VPHN) &&
 		   get_lppaca()->shared_proc) {
-		/* Disabled until races with load balancing are fixed */
 		if (!vphn_enabled) {
 			prrn_enabled = 0;
 			vphn_enabled = 1;