diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 19:46:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 19:46:06 -0500 |
| commit | 35d34df711e8b44846e759d8cfddb4ec6877cccb (patch) | |
| tree | 6ee37bcc2594add1050a77fdb272eda4414fe6c8 /arch/powerpc/mm/numa.c | |
| parent | ab02a9540541dd7b2012f32f5e311c3cbd772387 (diff) | |
| parent | 36e8695ca5dcf48c837a6efe6f780c47ac9ec808 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pseries: Disable VPNH feature
powerpc/iseries: Fix early init access to lppaca
Diffstat (limited to 'arch/powerpc/mm/numa.c')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 3 |
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) | |||
| 1516 | { | 1516 | { |
| 1517 | int rc = 0; | 1517 | int rc = 0; |
| 1518 | 1518 | ||
| 1519 | if (firmware_has_feature(FW_FEATURE_VPHN) && | 1519 | /* Disabled until races with load balancing are fixed */ |
| 1520 | if (0 && firmware_has_feature(FW_FEATURE_VPHN) && | ||
| 1520 | get_lppaca()->shared_proc) { | 1521 | get_lppaca()->shared_proc) { |
| 1521 | vphn_enabled = 1; | 1522 | vphn_enabled = 1; |
| 1522 | setup_cpu_associativity_change_counters(); | 1523 | setup_cpu_associativity_change_counters(); |