diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-27 07:47:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-27 07:47:34 +0200 |
| commit | 003263f45b8aa5466afe0209f75a077c50e8f477 (patch) | |
| tree | 7103d7f23e88fcdc301928bb157f6ef595c31c21 /kernel/softirq.c | |
| parent | 12f50da2e1ad0cda2fb5754298bd03b3b02eb78b (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge branch 'linus' into kmemcheck
Conflicts:
init/main.c
mm/slab.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 34180a50daae..0c64caa42f20 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -641,7 +641,7 @@ static struct notifier_block __cpuinitdata cpu_nfb = { .notifier_call = cpu_callback }; -__init int spawn_ksoftirqd(void) +static __init int spawn_ksoftirqd(void) { void *cpu = (void *)(long)smp_processor_id(); int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu); @@ -651,6 +651,7 @@ __init int spawn_ksoftirqd(void) register_cpu_notifier(&cpu_nfb); return 0; } +early_initcall(spawn_ksoftirqd); #ifdef CONFIG_SMP /* |