From c80321a493e035114c5aa63678500c7ebecf7e0a Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Sat, 29 Jan 2011 12:35:22 +0000
Subject: [PATCH] --- yaml --- r: 232975 b: refs/heads/master c:
 fe5cfd63557b39007460d17c585b8dc5ed6ace93 h: refs/heads/master i:   232973:
 bf1da19783ede0fa7daee3556da85821854f8801   232971:
 c33d620f00440a8af5bded355b4c8d57146c0c5e   232967:
 90251ad0f0f0f658f15f174f8c467e3bd6c03c32   232959:
 6465b4916bdced5a16335d4325a64b075718e6d8 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/powerpc/mm/numa.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99ddfdaa95c8..3ba1752b2b78 100644
--- 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
index d07cd08747e5..3cf33494a5ae 100644
--- 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);