summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-03-09 16:00:14 +0300
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-03-10 02:06:41 +0300
commit36e8695ca5dcf48c837a6efe6f780c47ac9ec808 (patch)
tree8959a20737350fa91854c0f9d6dc1dda00aa5e79
parentf2f6dad6ca3b06ae35a2e7b63f38158242c01531 (diff)
downloadlinux-36e8695ca5dcf48c837a6efe6f780c47ac9ec808.tar.xz
powerpc/pseries: Disable VPNH feature
This feature triggers nasty races in the scheduler between the rebuilding of the topology and the load balancing code, causing the machine to hang. Disable it for now until the races are fixed. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/mm/numa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index fd4812329570..0dc95c0aa3be 100644
--- a/arch/powerpc/mm/numa.c
+++ b/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();