---

yaml --- r: 232975 b: refs/heads/master c: fe5cfd6 h: refs/heads/master i: 232973: bf1da19 232971: c33d620 232967: 90251ad 232959: 6465b49 v: v3
git-mirror · Feb 7, 2011 · c80321a · c80321a
1 parent a337f88
commit c80321a
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: c0e5e46f3911a451b6915feda709fd1b9b7f026a
+refs/heads/master: fe5cfd63557b39007460d17c585b8dc5ed6ace93
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)) {
+	if (firmware_has_feature(FW_FEATURE_VPHN) &&
+	    get_lppaca()->shared_proc) {
 		vphn_enabled = 1;
 		setup_cpu_associativity_change_counters();
 		init_timer_deferrable(&topology_timer);