diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index eef79e84145f..04c662ba18f1 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -1058,7 +1058,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) | |||
1058 | check_tsc_sync_source(cpu); | 1058 | check_tsc_sync_source(cpu); |
1059 | local_irq_restore(flags); | 1059 | local_irq_restore(flags); |
1060 | 1060 | ||
1061 | while (!cpu_isset(cpu, cpu_online_map)) { | 1061 | while (!cpu_online(cpu)) { |
1062 | cpu_relax(); | 1062 | cpu_relax(); |
1063 | touch_nmi_watchdog(); | 1063 | touch_nmi_watchdog(); |
1064 | } | 1064 | } |
@@ -1168,7 +1168,7 @@ static void __init smp_cpu_index_default(void) | |||
1168 | int i; | 1168 | int i; |
1169 | struct cpuinfo_x86 *c; | 1169 | struct cpuinfo_x86 *c; |
1170 | 1170 | ||
1171 | for_each_cpu_mask(i, cpu_possible_map) { | 1171 | for_each_possible_cpu(i) { |
1172 | c = &cpu_data(i); | 1172 | c = &cpu_data(i); |
1173 | /* mark all to hotplug */ | 1173 | /* mark all to hotplug */ |
1174 | c->cpu_index = NR_CPUS; | 1174 | c->cpu_index = NR_CPUS; |