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/sh/include | |
| 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/sh/include')
| -rw-r--r-- | arch/sh/include/asm/topology.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index b69ee850906d..f8c40cc65054 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h | |||
| @@ -15,14 +15,14 @@ | |||
| 15 | .cache_nice_tries = 2, \ | 15 | .cache_nice_tries = 2, \ |
| 16 | .busy_idx = 3, \ | 16 | .busy_idx = 3, \ |
| 17 | .idle_idx = 2, \ | 17 | .idle_idx = 2, \ |
| 18 | .newidle_idx = 2, \ | 18 | .newidle_idx = 0, \ |
| 19 | .wake_idx = 1, \ | 19 | .wake_idx = 0, \ |
| 20 | .forkexec_idx = 1, \ | 20 | .forkexec_idx = 0, \ |
| 21 | .flags = SD_LOAD_BALANCE \ | 21 | .flags = SD_LOAD_BALANCE \ |
| 22 | | SD_BALANCE_FORK \ | 22 | | SD_BALANCE_FORK \ |
| 23 | | SD_BALANCE_EXEC \ | 23 | | SD_BALANCE_EXEC \ |
| 24 | | SD_SERIALIZE \ | 24 | | SD_BALANCE_NEWIDLE \ |
| 25 | | SD_WAKE_BALANCE, \ | 25 | | SD_SERIALIZE, \ |
| 26 | .last_balance = jiffies, \ | 26 | .last_balance = jiffies, \ |
| 27 | .balance_interval = 1, \ | 27 | .balance_interval = 1, \ |
| 28 | .nr_balance_failed = 0, \ | 28 | .nr_balance_failed = 0, \ |