diff options
author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2007-02-02 11:48:23 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:31 -0500 |
commit | f18c5a08bf035b51939281f5b49aa3ae45cea6ce (patch) | |
tree | 606046bfacc7aa04d9ad7b7a5ae2bb92d8f89d2c /arch/i386/kernel/acpi | |
parent | 5008740e27540e4069a2f8235f8308aba46036a2 (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/i386/kernel/acpi')
-rw-r--r-- | arch/i386/kernel/acpi/boot.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 2147511ea78d..e94aff6888ca 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
@@ -92,11 +92,6 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; | |||
92 | #warning ACPI uses CMPXCHG, i486 and later hardware | 92 | #warning ACPI uses CMPXCHG, i486 and later hardware |
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | #define MAX_MADT_ENTRIES 256 | ||
96 | u8 x86_acpiid_to_apicid[MAX_MADT_ENTRIES] = | ||
97 | {[0 ... MAX_MADT_ENTRIES - 1] = 0xff }; | ||
98 | EXPORT_SYMBOL(x86_acpiid_to_apicid); | ||
99 | |||
100 | /* -------------------------------------------------------------------------- | 95 | /* -------------------------------------------------------------------------- |
101 | Boot-time Configuration | 96 | Boot-time Configuration |
102 | -------------------------------------------------------------------------- */ | 97 | -------------------------------------------------------------------------- */ |
@@ -253,10 +248,6 @@ acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end) | |||
253 | 248 | ||
254 | acpi_table_print_madt_entry(header); | 249 | acpi_table_print_madt_entry(header); |
255 | 250 | ||
256 | /* Record local apic id only when enabled */ | ||
257 | if (processor->lapic_flags & ACPI_MADT_ENABLED) | ||
258 | x86_acpiid_to_apicid[processor->processor_id] = processor->id; | ||
259 | |||
260 | /* | 251 | /* |
261 | * We need to register disabled CPU as well to permit | 252 | * We need to register disabled CPU as well to permit |
262 | * counting disabled CPUs. This allows us to size | 253 | * counting disabled CPUs. This allows us to size |
@@ -563,14 +554,6 @@ EXPORT_SYMBOL(acpi_map_lsapic); | |||
563 | 554 | ||
564 | int acpi_unmap_lsapic(int cpu) | 555 | int acpi_unmap_lsapic(int cpu) |
565 | { | 556 | { |
566 | int i; | ||
567 | |||
568 | for_each_possible_cpu(i) { | ||
569 | if (x86_acpiid_to_apicid[i] == x86_cpu_to_apicid[cpu]) { | ||
570 | x86_acpiid_to_apicid[i] = -1; | ||
571 | break; | ||
572 | } | ||
573 | } | ||
574 | x86_cpu_to_apicid[cpu] = -1; | 557 | x86_cpu_to_apicid[cpu] = -1; |
575 | cpu_clear(cpu, cpu_present_map); | 558 | cpu_clear(cpu, cpu_present_map); |
576 | num_processors--; | 559 | num_processors--; |