git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpumask into release branch
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
acpi.c
diff --git
a/arch/ia64/kernel/acpi.c
b/arch/ia64/kernel/acpi.c
index
d541671
..
5510317
100644
(file)
--- a/
arch/ia64/kernel/acpi.c
+++ b/
arch/ia64/kernel/acpi.c
@@
-199,6
+199,10
@@
char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
return __va(phys_addr);
}
return __va(phys_addr);
}
+void __init __acpi_unmap_table(char *map, unsigned long size)
+{
+}
+
/* --------------------------------------------------------------------------
Boot-time Table Parsing
-------------------------------------------------------------------------- */
/* --------------------------------------------------------------------------
Boot-time Table Parsing
-------------------------------------------------------------------------- */
@@
-886,7
+890,7
@@
__init void prefill_possible_map(void)
possible, max((possible - available_cpus), 0));
for (i = 0; i < possible; i++)
possible, max((possible - available_cpus), 0));
for (i = 0; i < possible; i++)
-
cpu_set(i, cpu_possible_map
);
+
set_cpu_possible(i, true
);
}
int acpi_map_lsapic(acpi_handle handle, int *pcpu)
}
int acpi_map_lsapic(acpi_handle handle, int *pcpu)
@@
-924,9
+928,9
@@
int acpi_map_lsapic(acpi_handle handle, int *pcpu)
buffer.length = ACPI_ALLOCATE_BUFFER;
buffer.pointer = NULL;
buffer.length = ACPI_ALLOCATE_BUFFER;
buffer.pointer = NULL;
- cpu
s_complement(tmp_map, cpu_present_map
);
- cpu =
first_cpu(
tmp_map);
- if (cpu >=
NR_CPUS
)
+ cpu
mask_complement(&tmp_map, cpu_present_mask
);
+ cpu =
cpumask_first(&
tmp_map);
+ if (cpu >=
nr_cpu_ids
)
return -EINVAL;
acpi_map_cpu2node(handle, cpu, physid);
return -EINVAL;
acpi_map_cpu2node(handle, cpu, physid);