Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH 11/15] x86, ioapic: Only print mapping for ioapic in right place | Date | Sat, 23 Oct 2010 18:02:25 -0700 |
| |
When mapping does happen.
And only map ioapic address one time when mp_register_ioapic() is called.
Signed-off-by: Yinghai Lu <yinghai@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 0579b3b..1853494 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3980,11 +3980,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; @@ -4068,6 +4068,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.7.1
| |