From: Linus Torvalds Date: Fri, 7 Jan 2011 22:55:31 +0000 (-0800) Subject: Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: firefly_0821_release~7613^2~3104 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d004e4d3322340b6433caaef4a47ab8c933afb70;p=firefly-linux-kernel-4.4.55.git Merge branch 'x86-apic-cleanups-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: apic: Cleanup and simplify setup_local_APIC() x86: Further simplify mp_irq info handling x86: Unify 3 similar ways of saving mp_irqs info x86, ioapic: Avoid writing io_apic id if already correct x86, x2apic: Don't map lapic addr for preenabled x2apic systems x86, sfi: Use register_lapic_address() x86, apic: Use register_lapic_address() in init_apic_mapping() x86, apic: Remove early_init_lapic_mapping() x86, apic: Unify identical register_lapic_address() functions --- d004e4d3322340b6433caaef4a47ab8c933afb70