diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 7985c5b3f916..c414cee296ba 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -1346,7 +1346,7 @@ static void __ref remove_cpu_from_maps(int cpu) | |||
1346 | numa_remove_cpu(cpu); | 1346 | numa_remove_cpu(cpu); |
1347 | } | 1347 | } |
1348 | 1348 | ||
1349 | int __cpu_disable(void) | 1349 | int native_cpu_disable(void) |
1350 | { | 1350 | { |
1351 | int cpu = smp_processor_id(); | 1351 | int cpu = smp_processor_id(); |
1352 | 1352 | ||
@@ -1385,7 +1385,7 @@ int __cpu_disable(void) | |||
1385 | return 0; | 1385 | return 0; |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | void __cpu_die(unsigned int cpu) | 1388 | void native_cpu_die(unsigned int cpu) |
1389 | { | 1389 | { |
1390 | /* We don't do anything here: idle task is faking death itself. */ | 1390 | /* We don't do anything here: idle task is faking death itself. */ |
1391 | unsigned int i; | 1391 | unsigned int i; |
@@ -1403,12 +1403,12 @@ void __cpu_die(unsigned int cpu) | |||
1403 | printk(KERN_ERR "CPU %u didn't die...\n", cpu); | 1403 | printk(KERN_ERR "CPU %u didn't die...\n", cpu); |
1404 | } | 1404 | } |
1405 | #else /* ... !CONFIG_HOTPLUG_CPU */ | 1405 | #else /* ... !CONFIG_HOTPLUG_CPU */ |
1406 | int __cpu_disable(void) | 1406 | int native_cpu_disable(void) |
1407 | { | 1407 | { |
1408 | return -ENOSYS; | 1408 | return -ENOSYS; |
1409 | } | 1409 | } |
1410 | 1410 | ||
1411 | void __cpu_die(unsigned int cpu) | 1411 | void native_cpu_die(unsigned int cpu) |
1412 | { | 1412 | { |
1413 | /* We said "no" in __cpu_disable */ | 1413 | /* We said "no" in __cpu_disable */ |
1414 | BUG(); | 1414 | BUG(); |