diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 00:00:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 00:00:02 -0400 |
| commit | dcbf77b9e86e1726f5fbd01bb98820dac06d456e (patch) | |
| tree | 2f0b728ce70c03e1d0e3461e8a3c3d1fbe68fb90 /arch/mips | |
| parent | ca043a66ae48c74fa628ec92178f7a54f5b9a106 (diff) | |
| parent | 29cd8bae396583a2ee9a3340db8c5102acf9f6fd (diff) | |
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
sched: Fix SD_POWERSAVING_BALANCE|SD_PREFER_LOCAL vs SD_WAKE_AFFINE
sched: Stop buddies from hogging the system
sched: Add new wakeup preemption mode: WAKEUP_RUNNING
sched: Fix TASK_WAKING & loadaverage breakage
sched: Disable wakeup balancing
sched: Rename flags to wake_flags
sched: Clean up the load_idx selection in select_task_rq_fair
sched: Optimize cgroup vs wakeup a bit
sched: x86: Name old_perf in a unique way
sched: Implement a gentler fair-sleepers feature
sched: Add SD_PREFER_LOCAL
sched: Add a few SYNC hint knobs to play with
sched: Fix sync wakeups again
sched: Add WF_FORK
sched: Rename sync arguments
sched: Rename select_task_rq() argument
sched: Feature to disable APERF/MPERF cpu_power
x86: sched: Provide arch implementations using aperf/mperf
x86: Add generic aperf/mperf code
x86: Move APERF/MPERF into a X86_FEATURE
...
Fix up trivial conflict in arch/x86/include/asm/processor.h due to
nearby addition of amd_get_nb_id() declaration from the EDAC merge.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/include/asm/mach-ip27/topology.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h index 07547231e078..230591707005 100644 --- a/arch/mips/include/asm/mach-ip27/topology.h +++ b/arch/mips/include/asm/mach-ip27/topology.h | |||
| @@ -48,7 +48,6 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; | |||
| 48 | .cache_nice_tries = 1, \ | 48 | .cache_nice_tries = 1, \ |
| 49 | .flags = SD_LOAD_BALANCE \ | 49 | .flags = SD_LOAD_BALANCE \ |
| 50 | | SD_BALANCE_EXEC \ | 50 | | SD_BALANCE_EXEC \ |
| 51 | | SD_WAKE_BALANCE, \ | ||
| 52 | .last_balance = jiffies, \ | 51 | .last_balance = jiffies, \ |
| 53 | .balance_interval = 1, \ | 52 | .balance_interval = 1, \ |
| 54 | .nr_balance_failed = 0, \ | 53 | .nr_balance_failed = 0, \ |