diff options
| author | Alex Chiang <achiang@hp.com> | 2008-07-16 12:47:08 -0600 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-07-17 11:24:42 -0700 |
| commit | efc7508c9e29944fb3d9edf166d3d584557c33d1 (patch) | |
| tree | 0c261d41e19dad6c56b7511f9ab8b4a0e5f38415 /arch/ia64 | |
| parent | 740a8de0796dd12890b3c8ddcfabfcb528b78d40 (diff) | |
| download | op-kernel-dev-efc7508c9e29944fb3d9edf166d3d584557c33d1.zip op-kernel-dev-efc7508c9e29944fb3d9edf166d3d584557c33d1.tar.gz | |
[IA64] Avoid overflowing ia64_cpu_to_sapicid in acpi_map_lsapic()
acpi_map_lsapic tries to stuff a long into ia64_cpu_to_sapicid[],
which can only hold ints, so let's fix that.
We need to update the signature of acpi_map_cpu2node() too.
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 43687cc..5d1eb7e 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -774,7 +774,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) */ #ifdef CONFIG_ACPI_HOTPLUG_CPU static -int acpi_map_cpu2node(acpi_handle handle, int cpu, long physid) +int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) { #ifdef CONFIG_ACPI_NUMA int pxm_id; @@ -854,8 +854,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) union acpi_object *obj; struct acpi_madt_local_sapic *lsapic; cpumask_t tmp_map; - long physid; - int cpu; + int cpu, physid; if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer))) return -EINVAL; |
