Merge branch 'x86/cleanups' into x86/trampoline

2026-09-26 18:16:26 +00:00 · 2010-10-20 14:22:45 -07:00 · 2010-10-20 14:22:45 -07:00 · d25e6b0b32
commit d25e6b0b32
parent e44dea35cc 40ffa93791
19 changed files with 21 additions and 99 deletions
--- a/arch/x86/include/asm/apb_timer.h
+++ b/arch/x86/include/asm/apb_timer.h
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
--- a/arch/x86/kernel/pmtimer_64.c
+++ b/arch/x86/kernel/pmtimer_64.c
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/k8topology_64.c
+++ b/arch/x86/mm/k8topology_64.c
--- a/include/linux/acpi_pmtmr.h
+++ b/include/linux/acpi_pmtmr.h