diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /kernel/softirq.c | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index f6b03d56c2bf..c506f266a6b9 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -630,7 +630,7 @@ static struct notifier_block __cpuinitdata cpu_nfb = { | |||
| 630 | .notifier_call = cpu_callback | 630 | .notifier_call = cpu_callback |
| 631 | }; | 631 | }; |
| 632 | 632 | ||
| 633 | __init int spawn_ksoftirqd(void) | 633 | static __init int spawn_ksoftirqd(void) |
| 634 | { | 634 | { |
| 635 | void *cpu = (void *)(long)smp_processor_id(); | 635 | void *cpu = (void *)(long)smp_processor_id(); |
| 636 | int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu); | 636 | int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu); |
| @@ -640,6 +640,7 @@ __init int spawn_ksoftirqd(void) | |||
| 640 | register_cpu_notifier(&cpu_nfb); | 640 | register_cpu_notifier(&cpu_nfb); |
| 641 | return 0; | 641 | return 0; |
| 642 | } | 642 | } |
| 643 | early_initcall(spawn_ksoftirqd); | ||
| 643 | 644 | ||
| 644 | #ifdef CONFIG_SMP | 645 | #ifdef CONFIG_SMP |
| 645 | /* | 646 | /* |