i386: move kernel

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 397cfed..9c1da72 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -17,6 +17,13 @@
 # 20050320  Kianusch Sayah Karadji <kianusch@sk-tech.net>
 #           Added support for GEODE CPU
 
+# Fill in SRCARCH
+SRCARCH        := x86
+
+archprepare:
+       @mkdir -p ${objtree}/arch/x86/kernel
+
+
 HAS_BIARCH      := $(call cc-option-yn, -m32)
 ifeq ($(HAS_BIARCH),y)
 AS              := $(AS) --32
@@ -99,10 +106,10 @@ core-$(CONFIG_XEN)         += arch/x86/xen/
 # default subarch .h files
 mflags-y += -Iinclude/asm-i386/mach-default
 
-head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
+head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o
 
 libs-y                                         += arch/x86/lib/
-core-y                                 += arch/i386/kernel/ \
+core-y                                 += arch/x86/kernel/ \
                                           arch/x86/mm/ \
                                           $(mcore-y)/ \
                                           arch/x86/crypto/

diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S
index 4c1f17d..12d4148 100644 (file)
--- a/arch/um/sys-i386/sys_call_table.S
+++ b/arch/um/sys-i386/sys_call_table.S
@@ -9,4 +9,4 @@
 
 #define old_mmap old_mmap_i386
 
-#include "../../i386/kernel/syscall_table_32.S"
+#include "../../x86/kernel/syscall_table_32.S"

diff --git a/arch/i386/kernel/.gitignore b/arch/x86/kernel/.gitignore
similarity index 100%
rename from arch/i386/kernel/.gitignore
rename to arch/x86/kernel/.gitignore

diff --git a/arch/i386/kernel/Makefile b/arch/x86/kernel/Makefile
similarity index 64%
rename from arch/i386/kernel/Makefile
rename to arch/x86/kernel/Makefile
index d3ebd16..577d08f 100644 (file)
--- a/arch/i386/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/kernel/Makefile_32
+include ${srctree}/arch/x86/kernel/Makefile_32
 else
 include ${srctree}/arch/x86_64/kernel/Makefile_64
 endif

diff --git a/arch/i386/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32
similarity index 100%
rename from arch/i386/kernel/Makefile_32
rename to arch/x86/kernel/Makefile_32

diff --git a/arch/i386/kernel/alternative.c b/arch/x86/kernel/alternative.c
similarity index 100%
rename from arch/i386/kernel/alternative.c
rename to arch/x86/kernel/alternative.c

diff --git a/arch/i386/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
similarity index 100%
rename from arch/i386/kernel/apic_32.c
rename to arch/x86/kernel/apic_32.c

diff --git a/arch/i386/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
similarity index 100%
rename from arch/i386/kernel/apm_32.c
rename to arch/x86/kernel/apm_32.c

diff --git a/arch/i386/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
similarity index 100%
rename from arch/i386/kernel/asm-offsets.c
rename to arch/x86/kernel/asm-offsets.c

diff --git a/arch/i386/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
similarity index 100%
rename from arch/i386/kernel/asm-offsets_32.c
rename to arch/x86/kernel/asm-offsets_32.c

diff --git a/arch/i386/kernel/bootflag.c b/arch/x86/kernel/bootflag.c
similarity index 100%
rename from arch/i386/kernel/bootflag.c
rename to arch/x86/kernel/bootflag.c

diff --git a/arch/i386/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
similarity index 100%
rename from arch/i386/kernel/cpuid.c
rename to arch/x86/kernel/cpuid.c

diff --git a/arch/i386/kernel/crash_32.c b/arch/x86/kernel/crash_32.c
similarity index 100%
rename from arch/i386/kernel/crash_32.c
rename to arch/x86/kernel/crash_32.c

diff --git a/arch/i386/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c
similarity index 100%
rename from arch/i386/kernel/crash_dump_32.c
rename to arch/x86/kernel/crash_dump_32.c

diff --git a/arch/i386/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
similarity index 100%
rename from arch/i386/kernel/doublefault_32.c
rename to arch/x86/kernel/doublefault_32.c

diff --git a/arch/i386/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
similarity index 100%
rename from arch/i386/kernel/e820_32.c
rename to arch/x86/kernel/e820_32.c

diff --git a/arch/i386/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
similarity index 100%
rename from arch/i386/kernel/early_printk.c
rename to arch/x86/kernel/early_printk.c

diff --git a/arch/i386/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
similarity index 100%
rename from arch/i386/kernel/efi_32.c
rename to arch/x86/kernel/efi_32.c

diff --git a/arch/i386/kernel/efi_stub_32.S b/arch/x86/kernel/efi_stub_32.S
similarity index 100%
rename from arch/i386/kernel/efi_stub_32.S
rename to arch/x86/kernel/efi_stub_32.S

diff --git a/arch/i386/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
similarity index 100%
rename from arch/i386/kernel/entry_32.S
rename to arch/x86/kernel/entry_32.S

diff --git a/arch/i386/kernel/geode_32.c b/arch/x86/kernel/geode_32.c
similarity index 100%
rename from arch/i386/kernel/geode_32.c
rename to arch/x86/kernel/geode_32.c

diff --git a/arch/i386/kernel/head_32.S b/arch/x86/kernel/head_32.S
similarity index 100%
rename from arch/i386/kernel/head_32.S
rename to arch/x86/kernel/head_32.S

diff --git a/arch/i386/kernel/hpet_32.c b/arch/x86/kernel/hpet_32.c
similarity index 100%
rename from arch/i386/kernel/hpet_32.c
rename to arch/x86/kernel/hpet_32.c

diff --git a/arch/i386/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
similarity index 100%
rename from arch/i386/kernel/i386_ksyms_32.c
rename to arch/x86/kernel/i386_ksyms_32.c

diff --git a/arch/i386/kernel/i387_32.c b/arch/x86/kernel/i387_32.c
similarity index 100%
rename from arch/i386/kernel/i387_32.c
rename to arch/x86/kernel/i387_32.c

diff --git a/arch/i386/kernel/i8237.c b/arch/x86/kernel/i8237.c
similarity index 100%
rename from arch/i386/kernel/i8237.c
rename to arch/x86/kernel/i8237.c

diff --git a/arch/i386/kernel/i8253_32.c b/arch/x86/kernel/i8253_32.c
similarity index 100%
rename from arch/i386/kernel/i8253_32.c
rename to arch/x86/kernel/i8253_32.c

diff --git a/arch/i386/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c
similarity index 100%
rename from arch/i386/kernel/i8259_32.c
rename to arch/x86/kernel/i8259_32.c

diff --git a/arch/i386/kernel/init_task_32.c b/arch/x86/kernel/init_task_32.c
similarity index 100%
rename from arch/i386/kernel/init_task_32.c
rename to arch/x86/kernel/init_task_32.c

diff --git a/arch/i386/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
similarity index 100%
rename from arch/i386/kernel/io_apic_32.c
rename to arch/x86/kernel/io_apic_32.c

diff --git a/arch/i386/kernel/ioport_32.c b/arch/x86/kernel/ioport_32.c
similarity index 100%
rename from arch/i386/kernel/ioport_32.c
rename to arch/x86/kernel/ioport_32.c

diff --git a/arch/i386/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
similarity index 100%
rename from arch/i386/kernel/irq_32.c
rename to arch/x86/kernel/irq_32.c

diff --git a/arch/i386/kernel/kprobes_32.c b/arch/x86/kernel/kprobes_32.c
similarity index 100%
rename from arch/i386/kernel/kprobes_32.c
rename to arch/x86/kernel/kprobes_32.c

diff --git a/arch/i386/kernel/ldt_32.c b/arch/x86/kernel/ldt_32.c
similarity index 100%
rename from arch/i386/kernel/ldt_32.c
rename to arch/x86/kernel/ldt_32.c

diff --git a/arch/i386/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
similarity index 100%
rename from arch/i386/kernel/machine_kexec_32.c
rename to arch/x86/kernel/machine_kexec_32.c

diff --git a/arch/i386/kernel/mca_32.c b/arch/x86/kernel/mca_32.c
similarity index 100%
rename from arch/i386/kernel/mca_32.c
rename to arch/x86/kernel/mca_32.c

diff --git a/arch/i386/kernel/microcode.c b/arch/x86/kernel/microcode.c
similarity index 100%
rename from arch/i386/kernel/microcode.c
rename to arch/x86/kernel/microcode.c

diff --git a/arch/i386/kernel/module_32.c b/arch/x86/kernel/module_32.c
similarity index 100%
rename from arch/i386/kernel/module_32.c
rename to arch/x86/kernel/module_32.c

diff --git a/arch/i386/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
similarity index 100%
rename from arch/i386/kernel/mpparse_32.c
rename to arch/x86/kernel/mpparse_32.c

diff --git a/arch/i386/kernel/msr.c b/arch/x86/kernel/msr.c
similarity index 100%
rename from arch/i386/kernel/msr.c
rename to arch/x86/kernel/msr.c

diff --git a/arch/i386/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
similarity index 100%
rename from arch/i386/kernel/nmi_32.c
rename to arch/x86/kernel/nmi_32.c

diff --git a/arch/i386/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
similarity index 100%
rename from arch/i386/kernel/numaq_32.c
rename to arch/x86/kernel/numaq_32.c

diff --git a/arch/i386/kernel/paravirt_32.c b/arch/x86/kernel/paravirt_32.c
similarity index 100%
rename from arch/i386/kernel/paravirt_32.c
rename to arch/x86/kernel/paravirt_32.c

diff --git a/arch/i386/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c
similarity index 100%
rename from arch/i386/kernel/pci-dma_32.c
rename to arch/x86/kernel/pci-dma_32.c

diff --git a/arch/i386/kernel/pcspeaker.c b/arch/x86/kernel/pcspeaker.c
similarity index 100%
rename from arch/i386/kernel/pcspeaker.c
rename to arch/x86/kernel/pcspeaker.c

diff --git a/arch/i386/kernel/process_32.c b/arch/x86/kernel/process_32.c
similarity index 100%
rename from arch/i386/kernel/process_32.c
rename to arch/x86/kernel/process_32.c

diff --git a/arch/i386/kernel/ptrace_32.c b/arch/x86/kernel/ptrace_32.c
similarity index 100%
rename from arch/i386/kernel/ptrace_32.c
rename to arch/x86/kernel/ptrace_32.c

diff --git a/arch/i386/kernel/quirks.c b/arch/x86/kernel/quirks.c
similarity index 100%
rename from arch/i386/kernel/quirks.c
rename to arch/x86/kernel/quirks.c

diff --git a/arch/i386/kernel/reboot_32.c b/arch/x86/kernel/reboot_32.c
similarity index 100%
rename from arch/i386/kernel/reboot_32.c
rename to arch/x86/kernel/reboot_32.c

diff --git a/arch/i386/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
similarity index 100%
rename from arch/i386/kernel/reboot_fixups_32.c
rename to arch/x86/kernel/reboot_fixups_32.c

diff --git a/arch/i386/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S
similarity index 100%
rename from arch/i386/kernel/relocate_kernel_32.S
rename to arch/x86/kernel/relocate_kernel_32.S

diff --git a/arch/i386/kernel/scx200_32.c b/arch/x86/kernel/scx200_32.c
similarity index 100%
rename from arch/i386/kernel/scx200_32.c
rename to arch/x86/kernel/scx200_32.c

diff --git a/arch/i386/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
similarity index 100%
rename from arch/i386/kernel/setup_32.c
rename to arch/x86/kernel/setup_32.c

diff --git a/arch/i386/kernel/sigframe_32.h b/arch/x86/kernel/sigframe_32.h
similarity index 100%
rename from arch/i386/kernel/sigframe_32.h
rename to arch/x86/kernel/sigframe_32.h

diff --git a/arch/i386/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
similarity index 100%
rename from arch/i386/kernel/signal_32.c
rename to arch/x86/kernel/signal_32.c

diff --git a/arch/i386/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
similarity index 100%
rename from arch/i386/kernel/smp_32.c
rename to arch/x86/kernel/smp_32.c

diff --git a/arch/i386/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
similarity index 100%
rename from arch/i386/kernel/smpboot_32.c
rename to arch/x86/kernel/smpboot_32.c

diff --git a/arch/i386/kernel/smpcommon_32.c b/arch/x86/kernel/smpcommon_32.c
similarity index 100%
rename from arch/i386/kernel/smpcommon_32.c
rename to arch/x86/kernel/smpcommon_32.c

diff --git a/arch/i386/kernel/srat_32.c b/arch/x86/kernel/srat_32.c
similarity index 100%
rename from arch/i386/kernel/srat_32.c
rename to arch/x86/kernel/srat_32.c

diff --git a/arch/i386/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
similarity index 100%
rename from arch/i386/kernel/summit_32.c
rename to arch/x86/kernel/summit_32.c

diff --git a/arch/i386/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
similarity index 100%
rename from arch/i386/kernel/sys_i386_32.c
rename to arch/x86/kernel/sys_i386_32.c

diff --git a/arch/i386/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
similarity index 100%
rename from arch/i386/kernel/syscall_table_32.S
rename to arch/x86/kernel/syscall_table_32.S

diff --git a/arch/i386/kernel/sysenter_32.c b/arch/x86/kernel/sysenter_32.c
similarity index 100%
rename from arch/i386/kernel/sysenter_32.c
rename to arch/x86/kernel/sysenter_32.c

diff --git a/arch/i386/kernel/time_32.c b/arch/x86/kernel/time_32.c
similarity index 100%
rename from arch/i386/kernel/time_32.c
rename to arch/x86/kernel/time_32.c

diff --git a/arch/i386/kernel/topology.c b/arch/x86/kernel/topology.c
similarity index 100%
rename from arch/i386/kernel/topology.c
rename to arch/x86/kernel/topology.c

diff --git a/arch/i386/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
similarity index 100%
rename from arch/i386/kernel/trampoline_32.S
rename to arch/x86/kernel/trampoline_32.S

diff --git a/arch/i386/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
similarity index 100%
rename from arch/i386/kernel/traps_32.c
rename to arch/x86/kernel/traps_32.c

diff --git a/arch/i386/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
similarity index 100%
rename from arch/i386/kernel/tsc_32.c
rename to arch/x86/kernel/tsc_32.c

diff --git a/arch/i386/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
similarity index 100%
rename from arch/i386/kernel/tsc_sync.c
rename to arch/x86/kernel/tsc_sync.c

diff --git a/arch/i386/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
similarity index 100%
rename from arch/i386/kernel/vm86_32.c
rename to arch/x86/kernel/vm86_32.c

diff --git a/arch/i386/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
similarity index 100%
rename from arch/i386/kernel/vmi_32.c
rename to arch/x86/kernel/vmi_32.c

diff --git a/arch/i386/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c
similarity index 100%
rename from arch/i386/kernel/vmiclock_32.c
rename to arch/x86/kernel/vmiclock_32.c

diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
similarity index 100%
rename from arch/i386/kernel/vmlinux.lds.S
rename to arch/x86/kernel/vmlinux.lds.S

diff --git a/arch/i386/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
similarity index 100%
rename from arch/i386/kernel/vmlinux_32.lds.S
rename to arch/x86/kernel/vmlinux_32.lds.S

diff --git a/arch/i386/kernel/vsyscall-int80_32.S b/arch/x86/kernel/vsyscall-int80_32.S
similarity index 100%
rename from arch/i386/kernel/vsyscall-int80_32.S
rename to arch/x86/kernel/vsyscall-int80_32.S

diff --git a/arch/i386/kernel/vsyscall-note_32.S b/arch/x86/kernel/vsyscall-note_32.S
similarity index 100%
rename from arch/i386/kernel/vsyscall-note_32.S
rename to arch/x86/kernel/vsyscall-note_32.S

diff --git a/arch/i386/kernel/vsyscall-sigreturn_32.S b/arch/x86/kernel/vsyscall-sigreturn_32.S
similarity index 100%
rename from arch/i386/kernel/vsyscall-sigreturn_32.S
rename to arch/x86/kernel/vsyscall-sigreturn_32.S

diff --git a/arch/i386/kernel/vsyscall-sysenter_32.S b/arch/x86/kernel/vsyscall-sysenter_32.S
similarity index 100%
rename from arch/i386/kernel/vsyscall-sysenter_32.S
rename to arch/x86/kernel/vsyscall-sysenter_32.S

diff --git a/arch/i386/kernel/vsyscall_32.S b/arch/x86/kernel/vsyscall_32.S
similarity index 70%
rename from arch/i386/kernel/vsyscall_32.S
rename to arch/x86/kernel/vsyscall_32.S
index 0330744..a5ab3dc 100644 (file)
--- a/arch/i386/kernel/vsyscall_32.S
+++ b/arch/x86/kernel/vsyscall_32.S
@@ -4,12 +4,12 @@ __INITDATA
 
        .globl vsyscall_int80_start, vsyscall_int80_end
 vsyscall_int80_start:
-       .incbin "arch/i386/kernel/vsyscall-int80_32.so"
+       .incbin "arch/x86/kernel/vsyscall-int80_32.so"
 vsyscall_int80_end:
 
        .globl vsyscall_sysenter_start, vsyscall_sysenter_end
 vsyscall_sysenter_start:
-       .incbin "arch/i386/kernel/vsyscall-sysenter_32.so"
+       .incbin "arch/x86/kernel/vsyscall-sysenter_32.so"
 vsyscall_sysenter_end:
 
 __FINIT

diff --git a/arch/i386/kernel/vsyscall_32.lds.S b/arch/x86/kernel/vsyscall_32.lds.S
similarity index 100%
rename from arch/i386/kernel/vsyscall_32.lds.S
rename to arch/x86/kernel/vsyscall_32.lds.S

diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 08f489a..19d6d40 100644 (file)
--- a/arch/x86/mach-generic/Makefile
+++ b/arch/x86/mach-generic/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the generic architecture
 #
 
-EXTRA_CFLAGS   := -Iarch/i386/kernel
+EXTRA_CFLAGS   := -Iarch/x86/kernel
 
 obj-y          := probe.o summit.o bigsmp.o es7000.o default.o 
 obj-y          += ../../x86/mach-es7000/

diff --git a/arch/x86/mach-voyager/Makefile b/arch/x86/mach-voyager/Makefile
index 33b74cf..15c250b 100644 (file)
--- a/arch/x86/mach-voyager/Makefile
+++ b/arch/x86/mach-voyager/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_CFLAGS   := -Iarch/i386/kernel
+EXTRA_CFLAGS   := -Iarch/x86/kernel
 obj-y                  := setup.o voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)      += voyager_smp.o voyager_cat.o

diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86_64/ia32/vsyscall-sigreturn.S
index 83e7fd6..b383be0 100644 (file)
--- a/arch/x86_64/ia32/vsyscall-sigreturn.S
+++ b/arch/x86_64/ia32/vsyscall-sigreturn.S
@@ -139,5 +139,5 @@ __kernel_rt_sigreturn:
        .align 4
 .LENDFDE3:
 
-#include "../../i386/kernel/vsyscall-note_32.S"
+#include "../../x86/kernel/vsyscall-note_32.S"
 

diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index d3ebd16..577d08f 100644 (file)
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/kernel/Makefile_32
+include ${srctree}/arch/x86/kernel/Makefile_32
 else
 include ${srctree}/arch/x86_64/kernel/Makefile_64
 endif

diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64
index 690aebf..3a204cc 100644 (file)
--- a/arch/x86_64/kernel/Makefile_64
+++ b/arch/x86_64/kernel/Makefile_64
@@ -49,15 +49,15 @@ obj-y                               += pcspeaker.o
 CFLAGS_vsyscall_64.o           := $(PROFILING) -g0
 
 therm_throt-y                   += ../../x86/kernel/cpu/mcheck/therm_throt.o
-bootflag-y                     += ../../i386/kernel/bootflag.o
-cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
-topology-y                     += ../../i386/kernel/topology.o
-microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
+bootflag-y                     += ../../x86/kernel/bootflag.o
+cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../x86/kernel/cpuid.o
+topology-y                     += ../../x86/kernel/topology.o
+microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../x86/kernel/microcode.o
 intel_cacheinfo-y              += ../../x86/kernel/cpu/intel_cacheinfo.o
 addon_cpuid_features-y         += ../../x86/kernel/cpu/addon_cpuid_features.o
-quirks-y                       += ../../i386/kernel/quirks.o
-i8237-y                                += ../../i386/kernel/i8237.o
-msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
-alternative-y                  += ../../i386/kernel/alternative.o
-pcspeaker-y                    += ../../i386/kernel/pcspeaker.o
+quirks-y                       += ../../x86/kernel/quirks.o
+i8237-y                                += ../../x86/kernel/i8237.o
+msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../x86/kernel/msr.o
+alternative-y                  += ../../x86/kernel/alternative.o
+pcspeaker-y                    += ../../x86/kernel/pcspeaker.o
 perfctr-watchdog-y             += ../../x86/kernel/cpu/perfctr-watchdog.o