diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 00:28:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 00:28:42 +0200 |
| commit | 666484f0250db2e016948d63b3ef33e202e3b8d0 (patch) | |
| tree | 734f48c10aa364965e4f4642ee3de51669e62be2 /kernel/sched.c | |
| parent | Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| parent | Merge branch 'linus' into core/softirq (diff) | |
| download | linux-666484f0250db2e016948d63b3ef33e202e3b8d0.tar.xz linux-666484f0250db2e016948d63b3ef33e202e3b8d0.zip | |
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) #endif #ifdef CONFIG_SMP - open_softirq(SCHED_SOFTIRQ, run_rebalance_domains, NULL); + open_softirq(SCHED_SOFTIRQ, run_rebalance_domains); #endif #ifdef CONFIG_RT_MUTEXES |