Merge branch 'x86/apic-cleanups' into x86/numa

2026-09-26 18:16:26 +00:00 · 2010-12-29 11:36:26 -08:00 · 2010-12-29 11:36:26 -08:00 · d50e8fc7e3
commit d50e8fc7e3
parent a387e95a49 0aa002fe60
38 changed files with 2406 additions and 620 deletions
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
--- a/arch/x86/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
--- a/arch/x86/include/asm/mrst-vrtc.h
+++ b/arch/x86/include/asm/mrst-vrtc.h
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/mrst.h
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
--- a/arch/x86/kernel/reboot_fixups_32.c
+++ b/arch/x86/kernel/reboot_fixups_32.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
--- a/arch/x86/pci/ce4100.c
+++ b/arch/x86/pci/ce4100.c
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
--- a/arch/x86/platform/ce4100/Makefile
+++ b/arch/x86/platform/ce4100/Makefile
--- a/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
--- a/arch/x86/platform/iris/Makefile
+++ b/arch/x86/platform/iris/Makefile
--- a/arch/x86/platform/iris/iris.c
+++ b/arch/x86/platform/iris/iris.c
--- a/arch/x86/platform/mrst/Makefile
+++ b/arch/x86/platform/mrst/Makefile
--- a/arch/x86/platform/mrst/early_printk_mrst.c
+++ b/arch/x86/platform/mrst/early_printk_mrst.c
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
--- a/arch/x86/platform/sfi/sfi.c
+++ b/arch/x86/platform/sfi/sfi.c
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
--- a/include/linux/sfi.h
+++ b/include/linux/sfi.h