[PATCH 10/10] x86, ioapic: only print mapping for ioapic in right place
in [Kernel]
|
Prev: [PATCH 05/10] x86, apic: use smp_register_lapic_address in init_apic_mapping
Next: [PATCH 06/10] x86, sfi: used smp_register_lapic_address
From: Yinghai Lu on 6 Aug 2010 22:20 when mapping does happen. And only map ioapic address one time when mp_register_ioapic() is called. Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> --- arch/x86/kernel/apic/io_apic.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 4dc0084..badf10e 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -4192,11 +4192,11 @@ fake_ioapic_page: #endif ioapic_phys = (unsigned long)alloc_bootmem_pages(PAGE_SIZE); ioapic_phys = __pa(ioapic_phys); + set_fixmap_nocache(idx, ioapic_phys); + apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", + __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK), + ioapic_phys); } - set_fixmap_nocache(idx, ioapic_phys); - apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", - __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK), - ioapic_phys); idx++; ioapic_res->start = ioapic_phys; @@ -4278,6 +4278,9 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) mp_ioapics[idx].apicaddr = address; set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address); + apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08x)\n", + __fix_to_virt(FIX_IO_APIC_BASE_0 + idx) + (address & ~PAGE_MASK), + address); mp_ioapics[idx].apicid = io_apic_unique_id(id); mp_ioapics[idx].apicver = io_apic_get_version(idx); -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |