diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-04 05:54:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-04 05:59:45 -0500 |
| commit | a2e71271535fde493c32803b1f34789f97efcb5e (patch) | |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d /arch/mips/include/asm/mach-ip27/topology.h | |
| parent | 6d7aa9d721c8c640066142fd9534afcdf68d7f9d (diff) | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/include/asm/mach-ip27/topology.h')
| -rw-r--r-- | arch/mips/include/asm/mach-ip27/topology.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h index f6837422fe65..09a59bcc1b07 100644 --- a/arch/mips/include/asm/mach-ip27/topology.h +++ b/arch/mips/include/asm/mach-ip27/topology.h | |||
| @@ -44,8 +44,8 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; | |||
| 44 | .busy_factor = 32, \ | 44 | .busy_factor = 32, \ |
| 45 | .imbalance_pct = 125, \ | 45 | .imbalance_pct = 125, \ |
| 46 | .cache_nice_tries = 1, \ | 46 | .cache_nice_tries = 1, \ |
| 47 | .flags = SD_LOAD_BALANCE \ | 47 | .flags = SD_LOAD_BALANCE | \ |
| 48 | | SD_BALANCE_EXEC \ | 48 | SD_BALANCE_EXEC, \ |
| 49 | .last_balance = jiffies, \ | 49 | .last_balance = jiffies, \ |
| 50 | .balance_interval = 1, \ | 50 | .balance_interval = 1, \ |
| 51 | .nr_balance_failed = 0, \ | 51 | .nr_balance_failed = 0, \ |