diff options
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index d1cc81e63ba6..ac795d311f44 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -843,7 +843,7 @@ early_param("additional_cpus", setup_additional_cpus); | |||
843 | * are onlined, or offlined. The reason is per-cpu data-structures | 843 | * are onlined, or offlined. The reason is per-cpu data-structures |
844 | * are allocated by some modules at init time, and dont expect to | 844 | * are allocated by some modules at init time, and dont expect to |
845 | * do this dynamically on cpu arrival/departure. | 845 | * do this dynamically on cpu arrival/departure. |
846 | * cpu_present_map on the other hand can change dynamically. | 846 | * cpu_present_mask on the other hand can change dynamically. |
847 | * In case when cpu_hotplug is not compiled, then we resort to current | 847 | * In case when cpu_hotplug is not compiled, then we resort to current |
848 | * behaviour, which is cpu_possible == cpu_present. | 848 | * behaviour, which is cpu_possible == cpu_present. |
849 | * - Ashok Raj | 849 | * - Ashok Raj |
@@ -921,7 +921,7 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
921 | 921 | ||
922 | acpi_map_cpu2node(handle, cpu, physid); | 922 | acpi_map_cpu2node(handle, cpu, physid); |
923 | 923 | ||
924 | cpu_set(cpu, cpu_present_map); | 924 | set_cpu_present(cpu, true); |
925 | ia64_cpu_to_sapicid[cpu] = physid; | 925 | ia64_cpu_to_sapicid[cpu] = physid; |
926 | 926 | ||
927 | acpi_processor_set_pdc(handle); | 927 | acpi_processor_set_pdc(handle); |
@@ -940,7 +940,7 @@ EXPORT_SYMBOL(acpi_map_lsapic); | |||
940 | int acpi_unmap_lsapic(int cpu) | 940 | int acpi_unmap_lsapic(int cpu) |
941 | { | 941 | { |
942 | ia64_cpu_to_sapicid[cpu] = -1; | 942 | ia64_cpu_to_sapicid[cpu] = -1; |
943 | cpu_clear(cpu, cpu_present_map); | 943 | set_cpu_present(cpu, false); |
944 | 944 | ||
945 | #ifdef CONFIG_ACPI_NUMA | 945 | #ifdef CONFIG_ACPI_NUMA |
946 | /* NUMA specific cleanup's */ | 946 | /* NUMA specific cleanup's */ |