diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/smpboot_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index ef0f34ede1ab..4ea80cbe52e5 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c | |||
@@ -60,7 +60,7 @@ | |||
60 | #include <asm/mtrr.h> | 60 | #include <asm/mtrr.h> |
61 | 61 | ||
62 | /* Set if we find a B stepping CPU */ | 62 | /* Set if we find a B stepping CPU */ |
63 | static int __devinitdata smp_b_stepping; | 63 | static int __cpuinitdata smp_b_stepping; |
64 | 64 | ||
65 | /* Number of siblings per CPU package */ | 65 | /* Number of siblings per CPU package */ |
66 | int smp_num_siblings = 1; | 66 | int smp_num_siblings = 1; |
@@ -745,8 +745,8 @@ static inline int alloc_cpu_id(void) | |||
745 | } | 745 | } |
746 | 746 | ||
747 | #ifdef CONFIG_HOTPLUG_CPU | 747 | #ifdef CONFIG_HOTPLUG_CPU |
748 | static struct task_struct * __devinitdata cpu_idle_tasks[NR_CPUS]; | 748 | static struct task_struct * __cpuinitdata cpu_idle_tasks[NR_CPUS]; |
749 | static inline struct task_struct * alloc_idle_task(int cpu) | 749 | static inline struct task_struct * __cpuinit alloc_idle_task(int cpu) |
750 | { | 750 | { |
751 | struct task_struct *idle; | 751 | struct task_struct *idle; |
752 | 752 | ||