diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
| commit | 33175d84ee3fa29991adb80513683e010769e807 (patch) | |
| tree | 3731f61cf82451b6892cf1368701e57e35d92908 /arch/powerpc/mm/numa.c | |
| parent | c5908939b2738bafe1b309bc2465cb9f2e6184c5 (diff) | |
| parent | 6dfbd87a20a737641ef228230c77f4262434fa24 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_cmn.c
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(); |