diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 18:28:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 18:28:42 -0400 |
| commit | 666484f0250db2e016948d63b3ef33e202e3b8d0 (patch) | |
| tree | 734f48c10aa364965e4f4642ee3de51669e62be2 /kernel/sched.c | |
| parent | d18bb9a548e550f3ced57618e75085fb3f173133 (diff) | |
| parent | ace7f1b79670aa0c1d9f4b0442be82e565827333 (diff) | |
Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softirq: remove irqs_disabled warning from local_bh_enable
softirq: remove initialization of static per-cpu variable
Remove argument from open_softirq which is always NULL
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 2317a2178104..99e6d850ecab 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -8152,7 +8152,7 @@ void __init sched_init(void) | |||
| 8152 | #endif | 8152 | #endif |
| 8153 | 8153 | ||
| 8154 | #ifdef CONFIG_SMP | 8154 | #ifdef CONFIG_SMP |
| 8155 | open_softirq(SCHED_SOFTIRQ, run_rebalance_domains, NULL); | 8155 | open_softirq(SCHED_SOFTIRQ, run_rebalance_domains); |
| 8156 | #endif | 8156 | #endif |
| 8157 | 8157 | ||
| 8158 | #ifdef CONFIG_RT_MUTEXES | 8158 | #ifdef CONFIG_RT_MUTEXES |