diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /kernel/softirq.c | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
Merge branch 'merge'
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index ec8fed42a86f..336f92d64e2e 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -446,7 +446,7 @@ static void takeover_tasklets(unsigned int cpu) | |||
| 446 | } | 446 | } |
| 447 | #endif /* CONFIG_HOTPLUG_CPU */ | 447 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 448 | 448 | ||
| 449 | static int __devinit cpu_callback(struct notifier_block *nfb, | 449 | static int cpu_callback(struct notifier_block *nfb, |
| 450 | unsigned long action, | 450 | unsigned long action, |
| 451 | void *hcpu) | 451 | void *hcpu) |
| 452 | { | 452 | { |
| @@ -484,7 +484,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb, | |||
| 484 | return NOTIFY_OK; | 484 | return NOTIFY_OK; |
| 485 | } | 485 | } |
| 486 | 486 | ||
| 487 | static struct notifier_block __devinitdata cpu_nfb = { | 487 | static struct notifier_block cpu_nfb = { |
| 488 | .notifier_call = cpu_callback | 488 | .notifier_call = cpu_callback |
| 489 | }; | 489 | }; |
| 490 | 490 | ||