diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 00:50:47 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:21 -0500 |
commit | d190cb87c4503014353f2310c4bfa2268fa7111d (patch) | |
tree | c78b5fe53adfad99200c286897ba8883f8dfb5d1 /arch/x86/kernel/io_apic.c | |
parent | a5c4329622a3437adef4b2a4288d127957743c97 (diff) |
x86, apic: clean up ->ioapic_phys_id_map()
- separate the namespace
- remove macros
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/io_apic.c')
-rw-r--r-- | arch/x86/kernel/io_apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 49899e066247..db79ad9a7646 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -2108,7 +2108,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
2108 | * This is broken; anything with a real cpu count has to | 2108 | * This is broken; anything with a real cpu count has to |
2109 | * circumvent this idiocy regardless. | 2109 | * circumvent this idiocy regardless. |
2110 | */ | 2110 | */ |
2111 | phys_id_present_map = ioapic_phys_id_map(phys_cpu_present_map); | 2111 | phys_id_present_map = apic->ioapic_phys_id_map(phys_cpu_present_map); |
2112 | 2112 | ||
2113 | /* | 2113 | /* |
2114 | * Set the IOAPIC ID to the value stored in the MPC table. | 2114 | * Set the IOAPIC ID to the value stored in the MPC table. |
@@ -3862,7 +3862,7 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id) | |||
3862 | */ | 3862 | */ |
3863 | 3863 | ||
3864 | if (physids_empty(apic_id_map)) | 3864 | if (physids_empty(apic_id_map)) |
3865 | apic_id_map = ioapic_phys_id_map(phys_cpu_present_map); | 3865 | apic_id_map = apic->ioapic_phys_id_map(phys_cpu_present_map); |
3866 | 3866 | ||
3867 | spin_lock_irqsave(&ioapic_lock, flags); | 3867 | spin_lock_irqsave(&ioapic_lock, flags); |
3868 | reg_00.raw = io_apic_read(ioapic, 0); | 3868 | reg_00.raw = io_apic_read(ioapic, 0); |