diff options
| author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 17:24:52 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-03-31 17:24:52 -0400 |
| commit | 50fbe56c127efde659c686495eb1f925fd84ff0a (patch) | |
| tree | 6eb331035b3c03b4f97ba888c6d66017e84df4c5 /arch/ia64/kernel/acpi.c | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
| parent | 5d8c39f68e1dc78c1a958e28bc685a5bac125b21 (diff) | |
Pull cpumask into release branch
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index bdef2ce38c8b..5510317db37b 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -890,7 +890,7 @@ __init void prefill_possible_map(void) | |||
| 890 | possible, max((possible - available_cpus), 0)); | 890 | possible, max((possible - available_cpus), 0)); |
| 891 | 891 | ||
| 892 | for (i = 0; i < possible; i++) | 892 | for (i = 0; i < possible; i++) |
| 893 | cpu_set(i, cpu_possible_map); | 893 | set_cpu_possible(i, true); |
| 894 | } | 894 | } |
| 895 | 895 | ||
| 896 | int acpi_map_lsapic(acpi_handle handle, int *pcpu) | 896 | int acpi_map_lsapic(acpi_handle handle, int *pcpu) |
| @@ -928,9 +928,9 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
| 928 | buffer.length = ACPI_ALLOCATE_BUFFER; | 928 | buffer.length = ACPI_ALLOCATE_BUFFER; |
| 929 | buffer.pointer = NULL; | 929 | buffer.pointer = NULL; |
| 930 | 930 | ||
| 931 | cpus_complement(tmp_map, cpu_present_map); | 931 | cpumask_complement(&tmp_map, cpu_present_mask); |
| 932 | cpu = first_cpu(tmp_map); | 932 | cpu = cpumask_first(&tmp_map); |
| 933 | if (cpu >= NR_CPUS) | 933 | if (cpu >= nr_cpu_ids) |
| 934 | return -EINVAL; | 934 | return -EINVAL; |
| 935 | 935 | ||
| 936 | acpi_map_cpu2node(handle, cpu, physid); | 936 | acpi_map_cpu2node(handle, cpu, physid); |