diff options
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 0f08a84ae307..aab880677ce0 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -547,7 +547,7 @@ static void takeover_tasklets(unsigned int cpu) | |||
| 547 | } | 547 | } |
| 548 | #endif /* CONFIG_HOTPLUG_CPU */ | 548 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 549 | 549 | ||
| 550 | static int __devinit cpu_callback(struct notifier_block *nfb, | 550 | static int __cpuinit cpu_callback(struct notifier_block *nfb, |
| 551 | unsigned long action, | 551 | unsigned long action, |
| 552 | void *hcpu) | 552 | void *hcpu) |
| 553 | { | 553 | { |
| @@ -587,7 +587,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb, | |||
| 587 | return NOTIFY_OK; | 587 | return NOTIFY_OK; |
| 588 | } | 588 | } |
| 589 | 589 | ||
| 590 | static struct notifier_block __devinitdata cpu_nfb = { | 590 | static struct notifier_block __cpuinitdata cpu_nfb = { |
| 591 | .notifier_call = cpu_callback | 591 | .notifier_call = cpu_callback |
| 592 | }; | 592 | }; |
| 593 | 593 | ||
