diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /arch/ia64/kernel/acpi.c | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 bdef2ce38c8..5510317db37 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); |