aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>2007-02-02 11:48:23 -0500
committerLen Brown <len.brown@intel.com>2007-02-02 21:14:31 -0500
commitf18c5a08bf035b51939281f5b49aa3ae45cea6ce (patch)
tree606046bfacc7aa04d9ad7b7a5ae2bb92d8f89d2c /arch/ia64
parent5008740e27540e4069a2f8235f8308aba46036a2 (diff)
ACPICA: Allow ACPI id to be u32 instead of u8.
Allow ACPI id to be u32 instead of u8. Requires drop of conversion tables with the acpiid as index. Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/acpi.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 4719e481d93b..989ffc3f7ce3 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -67,11 +67,6 @@ EXPORT_SYMBOL(pm_power_off);
67unsigned int acpi_cpei_override; 67unsigned int acpi_cpei_override;
68unsigned int acpi_cpei_phys_cpuid; 68unsigned int acpi_cpei_phys_cpuid;
69 69
70#define MAX_SAPICS 256
71u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0 ... MAX_SAPICS - 1] = -1 };
72
73EXPORT_SYMBOL(ia64_acpiid_to_sapicid);
74
75const char *acpi_get_sysname(void) 70const char *acpi_get_sysname(void)
76{ 71{
77#ifdef CONFIG_IA64_GENERIC 72#ifdef CONFIG_IA64_GENERIC
@@ -200,8 +195,6 @@ acpi_parse_lsapic(struct acpi_subtable_header * header, const unsigned long end)
200 smp_boot_data.cpu_phys_id[available_cpus] = 195 smp_boot_data.cpu_phys_id[available_cpus] =
201 (lsapic->id << 8) | lsapic->eid; 196 (lsapic->id << 8) | lsapic->eid;
202#endif 197#endif
203 ia64_acpiid_to_sapicid[lsapic->processor_id] =
204 (lsapic->id << 8) | lsapic->eid;
205 ++available_cpus; 198 ++available_cpus;
206 } 199 }
207 200
@@ -880,7 +873,6 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
880 873
881 cpu_set(cpu, cpu_present_map); 874 cpu_set(cpu, cpu_present_map);
882 ia64_cpu_to_sapicid[cpu] = physid; 875 ia64_cpu_to_sapicid[cpu] = physid;
883 ia64_acpiid_to_sapicid[lsapic->processor_id] = ia64_cpu_to_sapicid[cpu];
884 876
885 *pcpu = cpu; 877 *pcpu = cpu;
886 return (0); 878 return (0);
@@ -890,14 +882,6 @@ EXPORT_SYMBOL(acpi_map_lsapic);
890 882
891int acpi_unmap_lsapic(int cpu) 883int acpi_unmap_lsapic(int cpu)
892{ 884{
893 int i;
894
895 for (i = 0; i < MAX_SAPICS; i++) {
896 if (ia64_acpiid_to_sapicid[i] == ia64_cpu_to_sapicid[cpu]) {
897 ia64_acpiid_to_sapicid[i] = -1;
898 break;
899 }
900 }
901 ia64_cpu_to_sapicid[cpu] = -1; 885 ia64_cpu_to_sapicid[cpu] = -1;
902 cpu_clear(cpu, cpu_present_map); 886 cpu_clear(cpu, cpu_present_map);
903 887