From 10de3b7f4f92c3863ed1a8e28b22d03620b14765 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 9 Mar 2011 13:00:14 +0000
Subject: [PATCH] --- yaml --- r: 234019 b: refs/heads/master c:
 36e8695ca5dcf48c837a6efe6f780c47ac9ec808 h: refs/heads/master i:   234017:
 eaeb1193ad2c0ed20c10d25da7b694af6eb242ab   234015:
 098f725771349824d1ed602249fb68755ec2da55 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 3e53ec439a73..b19921ec1b4b 100644
--- 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
index fd4812329570..0dc95c0aa3be 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) &&
+	/* 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();