diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/Makefile | 11 | ||||
-rw-r--r-- | arch/um/sys-i386/sys_call_table.S | 2 | ||||
-rw-r--r-- | arch/x86/kernel/.gitignore (renamed from arch/i386/kernel/.gitignore) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/Makefile (renamed from arch/i386/kernel/Makefile) | 2 | ||||
-rw-r--r-- | arch/x86/kernel/Makefile_32 (renamed from arch/i386/kernel/Makefile_32) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/alternative.c (renamed from arch/i386/kernel/alternative.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/apic_32.c (renamed from arch/i386/kernel/apic_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/apm_32.c (renamed from arch/i386/kernel/apm_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/asm-offsets.c (renamed from arch/i386/kernel/asm-offsets.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/asm-offsets_32.c (renamed from arch/i386/kernel/asm-offsets_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/bootflag.c (renamed from arch/i386/kernel/bootflag.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/cpuid.c (renamed from arch/i386/kernel/cpuid.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/crash_32.c (renamed from arch/i386/kernel/crash_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/crash_dump_32.c (renamed from arch/i386/kernel/crash_dump_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/doublefault_32.c (renamed from arch/i386/kernel/doublefault_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/e820_32.c (renamed from arch/i386/kernel/e820_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/early_printk.c (renamed from arch/i386/kernel/early_printk.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/efi_32.c (renamed from arch/i386/kernel/efi_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/efi_stub_32.S (renamed from arch/i386/kernel/efi_stub_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/entry_32.S (renamed from arch/i386/kernel/entry_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/geode_32.c (renamed from arch/i386/kernel/geode_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/head_32.S (renamed from arch/i386/kernel/head_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/hpet_32.c (renamed from arch/i386/kernel/hpet_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/i386_ksyms_32.c (renamed from arch/i386/kernel/i386_ksyms_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/i387_32.c (renamed from arch/i386/kernel/i387_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/i8237.c (renamed from arch/i386/kernel/i8237.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/i8253_32.c (renamed from arch/i386/kernel/i8253_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/i8259_32.c (renamed from arch/i386/kernel/i8259_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/init_task_32.c (renamed from arch/i386/kernel/init_task_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_32.c (renamed from arch/i386/kernel/io_apic_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/ioport_32.c (renamed from arch/i386/kernel/ioport_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/irq_32.c (renamed from arch/i386/kernel/irq_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/kprobes_32.c (renamed from arch/i386/kernel/kprobes_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/ldt_32.c (renamed from arch/i386/kernel/ldt_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/machine_kexec_32.c (renamed from arch/i386/kernel/machine_kexec_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/mca_32.c (renamed from arch/i386/kernel/mca_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/microcode.c (renamed from arch/i386/kernel/microcode.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/module_32.c (renamed from arch/i386/kernel/module_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse_32.c (renamed from arch/i386/kernel/mpparse_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/msr.c (renamed from arch/i386/kernel/msr.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/nmi_32.c (renamed from arch/i386/kernel/nmi_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/numaq_32.c (renamed from arch/i386/kernel/numaq_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/paravirt_32.c (renamed from arch/i386/kernel/paravirt_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/pci-dma_32.c (renamed from arch/i386/kernel/pci-dma_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/pcspeaker.c (renamed from arch/i386/kernel/pcspeaker.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/process_32.c (renamed from arch/i386/kernel/process_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/ptrace_32.c (renamed from arch/i386/kernel/ptrace_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/quirks.c (renamed from arch/i386/kernel/quirks.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/reboot_32.c (renamed from arch/i386/kernel/reboot_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/reboot_fixups_32.c (renamed from arch/i386/kernel/reboot_fixups_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/relocate_kernel_32.S (renamed from arch/i386/kernel/relocate_kernel_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/scx200_32.c (renamed from arch/i386/kernel/scx200_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/setup_32.c (renamed from arch/i386/kernel/setup_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/sigframe_32.h (renamed from arch/i386/kernel/sigframe_32.h) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/signal_32.c (renamed from arch/i386/kernel/signal_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/smp_32.c (renamed from arch/i386/kernel/smp_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/smpboot_32.c (renamed from arch/i386/kernel/smpboot_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/smpcommon_32.c (renamed from arch/i386/kernel/smpcommon_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/srat_32.c (renamed from arch/i386/kernel/srat_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/summit_32.c (renamed from arch/i386/kernel/summit_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/sys_i386_32.c (renamed from arch/i386/kernel/sys_i386_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/syscall_table_32.S (renamed from arch/i386/kernel/syscall_table_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/sysenter_32.c (renamed from arch/i386/kernel/sysenter_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/time_32.c (renamed from arch/i386/kernel/time_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/topology.c (renamed from arch/i386/kernel/topology.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/trampoline_32.S (renamed from arch/i386/kernel/trampoline_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/traps_32.c (renamed from arch/i386/kernel/traps_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/tsc_32.c (renamed from arch/i386/kernel/tsc_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/tsc_sync.c (renamed from arch/i386/kernel/tsc_sync.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vm86_32.c (renamed from arch/i386/kernel/vm86_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vmi_32.c (renamed from arch/i386/kernel/vmi_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vmiclock_32.c (renamed from arch/i386/kernel/vmiclock_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vmlinux.lds.S (renamed from arch/i386/kernel/vmlinux.lds.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vmlinux_32.lds.S (renamed from arch/i386/kernel/vmlinux_32.lds.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall-int80_32.S (renamed from arch/i386/kernel/vsyscall-int80_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall-note_32.S (renamed from arch/i386/kernel/vsyscall-note_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall-sigreturn_32.S (renamed from arch/i386/kernel/vsyscall-sigreturn_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall-sysenter_32.S (renamed from arch/i386/kernel/vsyscall-sysenter_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall_32.S (renamed from arch/i386/kernel/vsyscall_32.S) | 4 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall_32.lds.S (renamed from arch/i386/kernel/vsyscall_32.lds.S) | 0 | ||||
-rw-r--r-- | arch/x86/mach-generic/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/mach-voyager/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/ia32/vsyscall-sigreturn.S | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/Makefile_64 | 18 |
85 files changed, 26 insertions, 19 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 397cfed..9c1da72 100644 --- 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 --- 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 index 40836ad..40836ad 100644 --- a/arch/i386/kernel/.gitignore +++ b/arch/x86/kernel/.gitignore diff --git a/arch/i386/kernel/Makefile b/arch/x86/kernel/Makefile index d3ebd16..577d08f 100644 --- 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 index 5096f48..5096f48 100644 --- a/arch/i386/kernel/Makefile_32 +++ b/arch/x86/kernel/Makefile_32 diff --git a/arch/i386/kernel/alternative.c b/arch/x86/kernel/alternative.c index bd72d94..bd72d94 100644 --- a/arch/i386/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c diff --git a/arch/i386/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 3d67ae1..3d67ae1 100644 --- a/arch/i386/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c diff --git a/arch/i386/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index f02a8ac..f02a8ac 100644 --- a/arch/i386/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c diff --git a/arch/i386/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c index cfa82c8..cfa82c8 100644 --- a/arch/i386/kernel/asm-offsets.c +++ b/arch/x86/kernel/asm-offsets.c diff --git a/arch/i386/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c index 8029742..8029742 100644 --- a/arch/i386/kernel/asm-offsets_32.c +++ b/arch/x86/kernel/asm-offsets_32.c diff --git a/arch/i386/kernel/bootflag.c b/arch/x86/kernel/bootflag.c index 0b98605..0b98605 100644 --- a/arch/i386/kernel/bootflag.c +++ b/arch/x86/kernel/bootflag.c diff --git a/arch/i386/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 5c2faa1..5c2faa1 100644 --- a/arch/i386/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c diff --git a/arch/i386/kernel/crash_32.c b/arch/x86/kernel/crash_32.c index 53589d1..53589d1 100644 --- a/arch/i386/kernel/crash_32.c +++ b/arch/x86/kernel/crash_32.c diff --git a/arch/i386/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c index 3f532df..3f532df 100644 --- a/arch/i386/kernel/crash_dump_32.c +++ b/arch/x86/kernel/crash_dump_32.c diff --git a/arch/i386/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c index 40978af..40978af 100644 --- a/arch/i386/kernel/doublefault_32.c +++ b/arch/x86/kernel/doublefault_32.c diff --git a/arch/i386/kernel/e820_32.c b/arch/x86/kernel/e820_32.c index 3c86b97..3c86b97 100644 --- a/arch/i386/kernel/e820_32.c +++ b/arch/x86/kernel/e820_32.c diff --git a/arch/i386/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index 92f812b..92f812b 100644 --- a/arch/i386/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c diff --git a/arch/i386/kernel/efi_32.c b/arch/x86/kernel/efi_32.c index 2452c6f..2452c6f 100644 --- a/arch/i386/kernel/efi_32.c +++ b/arch/x86/kernel/efi_32.c diff --git a/arch/i386/kernel/efi_stub_32.S b/arch/x86/kernel/efi_stub_32.S index ef00bb7..ef00bb7 100644 --- a/arch/i386/kernel/efi_stub_32.S +++ b/arch/x86/kernel/efi_stub_32.S diff --git a/arch/i386/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 290b7bc..290b7bc 100644 --- a/arch/i386/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S diff --git a/arch/i386/kernel/geode_32.c b/arch/x86/kernel/geode_32.c index 41e8aec..41e8aec 100644 --- a/arch/i386/kernel/geode_32.c +++ b/arch/x86/kernel/geode_32.c diff --git a/arch/i386/kernel/head_32.S b/arch/x86/kernel/head_32.S index 9150ca9..9150ca9 100644 --- a/arch/i386/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S diff --git a/arch/i386/kernel/hpet_32.c b/arch/x86/kernel/hpet_32.c index 533d493..533d493 100644 --- a/arch/i386/kernel/hpet_32.c +++ b/arch/x86/kernel/hpet_32.c diff --git a/arch/i386/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c index e3d4b73..e3d4b73 100644 --- a/arch/i386/kernel/i386_ksyms_32.c +++ b/arch/x86/kernel/i386_ksyms_32.c diff --git a/arch/i386/kernel/i387_32.c b/arch/x86/kernel/i387_32.c index 6658472..6658472 100644 --- a/arch/i386/kernel/i387_32.c +++ b/arch/x86/kernel/i387_32.c diff --git a/arch/i386/kernel/i8237.c b/arch/x86/kernel/i8237.c index 6f508e8..6f508e8 100644 --- a/arch/i386/kernel/i8237.c +++ b/arch/x86/kernel/i8237.c diff --git a/arch/i386/kernel/i8253_32.c b/arch/x86/kernel/i8253_32.c index 6d839f2..6d839f2 100644 --- a/arch/i386/kernel/i8253_32.c +++ b/arch/x86/kernel/i8253_32.c diff --git a/arch/i386/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c index 0499cbe..0499cbe 100644 --- a/arch/i386/kernel/i8259_32.c +++ b/arch/x86/kernel/i8259_32.c diff --git a/arch/i386/kernel/init_task_32.c b/arch/x86/kernel/init_task_32.c index d26fc06..d26fc06 100644 --- a/arch/i386/kernel/init_task_32.c +++ b/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 index e2f4a1c..e2f4a1c 100644 --- a/arch/i386/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c diff --git a/arch/i386/kernel/ioport_32.c b/arch/x86/kernel/ioport_32.c index 3d310a9..3d310a9 100644 --- a/arch/i386/kernel/ioport_32.c +++ b/arch/x86/kernel/ioport_32.c diff --git a/arch/i386/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index dd2b97f..dd2b97f 100644 --- a/arch/i386/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c diff --git a/arch/i386/kernel/kprobes_32.c b/arch/x86/kernel/kprobes_32.c index 448a50b..448a50b 100644 --- a/arch/i386/kernel/kprobes_32.c +++ b/arch/x86/kernel/kprobes_32.c diff --git a/arch/i386/kernel/ldt_32.c b/arch/x86/kernel/ldt_32.c index e0b2d17..e0b2d17 100644 --- a/arch/i386/kernel/ldt_32.c +++ b/arch/x86/kernel/ldt_32.c diff --git a/arch/i386/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index 91966ba..91966ba 100644 --- a/arch/i386/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c diff --git a/arch/i386/kernel/mca_32.c b/arch/x86/kernel/mca_32.c index b83672b..b83672b 100644 --- a/arch/i386/kernel/mca_32.c +++ b/arch/x86/kernel/mca_32.c diff --git a/arch/i386/kernel/microcode.c b/arch/x86/kernel/microcode.c index 09cf781..09cf781 100644 --- a/arch/i386/kernel/microcode.c +++ b/arch/x86/kernel/microcode.c diff --git a/arch/i386/kernel/module_32.c b/arch/x86/kernel/module_32.c index 3db0a544..3db0a544 100644 --- a/arch/i386/kernel/module_32.c +++ b/arch/x86/kernel/module_32.c diff --git a/arch/i386/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index 13abb4e..13abb4e 100644 --- a/arch/i386/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c diff --git a/arch/i386/kernel/msr.c b/arch/x86/kernel/msr.c index 0c1069b..0c1069b 100644 --- a/arch/i386/kernel/msr.c +++ b/arch/x86/kernel/msr.c diff --git a/arch/i386/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index c7227e2..c7227e2 100644 --- a/arch/i386/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c diff --git a/arch/i386/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index 9000d82..9000d82 100644 --- a/arch/i386/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c diff --git a/arch/i386/kernel/paravirt_32.c b/arch/x86/kernel/paravirt_32.c index 739cfb2..739cfb2 100644 --- a/arch/i386/kernel/paravirt_32.c +++ b/arch/x86/kernel/paravirt_32.c diff --git a/arch/i386/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c index 048f09b..048f09b 100644 --- a/arch/i386/kernel/pci-dma_32.c +++ b/arch/x86/kernel/pci-dma_32.c diff --git a/arch/i386/kernel/pcspeaker.c b/arch/x86/kernel/pcspeaker.c index bc1f2d3..bc1f2d3 100644 --- a/arch/i386/kernel/pcspeaker.c +++ b/arch/x86/kernel/pcspeaker.c diff --git a/arch/i386/kernel/process_32.c b/arch/x86/kernel/process_32.c index 8466471..8466471 100644 --- a/arch/i386/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c diff --git a/arch/i386/kernel/ptrace_32.c b/arch/x86/kernel/ptrace_32.c index 7c1b925..7c1b925 100644 --- a/arch/i386/kernel/ptrace_32.c +++ b/arch/x86/kernel/ptrace_32.c diff --git a/arch/i386/kernel/quirks.c b/arch/x86/kernel/quirks.c index 6722469..6722469 100644 --- a/arch/i386/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c diff --git a/arch/i386/kernel/reboot_32.c b/arch/x86/kernel/reboot_32.c index 0d79624..0d79624 100644 --- a/arch/i386/kernel/reboot_32.c +++ b/arch/x86/kernel/reboot_32.c diff --git a/arch/i386/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c index 03e1cce..03e1cce 100644 --- a/arch/i386/kernel/reboot_fixups_32.c +++ b/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 index f151d6f..f151d6f 100644 --- a/arch/i386/kernel/relocate_kernel_32.S +++ b/arch/x86/kernel/relocate_kernel_32.S diff --git a/arch/i386/kernel/scx200_32.c b/arch/x86/kernel/scx200_32.c index c7d3df2..c7d3df2 100644 --- a/arch/i386/kernel/scx200_32.c +++ b/arch/x86/kernel/scx200_32.c diff --git a/arch/i386/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index d474cd6..d474cd6 100644 --- a/arch/i386/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c diff --git a/arch/i386/kernel/sigframe_32.h b/arch/x86/kernel/sigframe_32.h index 0b22217..0b22217 100644 --- a/arch/i386/kernel/sigframe_32.h +++ b/arch/x86/kernel/sigframe_32.h diff --git a/arch/i386/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index c03570f..c03570f 100644 --- a/arch/i386/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c diff --git a/arch/i386/kernel/smp_32.c b/arch/x86/kernel/smp_32.c index 2d35d85..2d35d85 100644 --- a/arch/i386/kernel/smp_32.c +++ b/arch/x86/kernel/smp_32.c diff --git a/arch/i386/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index e4f61d1..e4f61d1 100644 --- a/arch/i386/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c diff --git a/arch/i386/kernel/smpcommon_32.c b/arch/x86/kernel/smpcommon_32.c index bbfe85a..bbfe85a 100644 --- a/arch/i386/kernel/smpcommon_32.c +++ b/arch/x86/kernel/smpcommon_32.c diff --git a/arch/i386/kernel/srat_32.c b/arch/x86/kernel/srat_32.c index 2a8713e..2a8713e 100644 --- a/arch/i386/kernel/srat_32.c +++ b/arch/x86/kernel/srat_32.c diff --git a/arch/i386/kernel/summit_32.c b/arch/x86/kernel/summit_32.c index d0e01a3..d0e01a3 100644 --- a/arch/i386/kernel/summit_32.c +++ b/arch/x86/kernel/summit_32.c diff --git a/arch/i386/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c index 4214730..4214730 100644 --- a/arch/i386/kernel/sys_i386_32.c +++ b/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 index 8344c70..8344c70 100644 --- a/arch/i386/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S diff --git a/arch/i386/kernel/sysenter_32.c b/arch/x86/kernel/sysenter_32.c index 4eb2e40..4eb2e40 100644 --- a/arch/i386/kernel/sysenter_32.c +++ b/arch/x86/kernel/sysenter_32.c diff --git a/arch/i386/kernel/time_32.c b/arch/x86/kernel/time_32.c index 19a6c67..19a6c67 100644 --- a/arch/i386/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c diff --git a/arch/i386/kernel/topology.c b/arch/x86/kernel/topology.c index 45782356..45782356 100644 --- a/arch/i386/kernel/topology.c +++ b/arch/x86/kernel/topology.c diff --git a/arch/i386/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S index f62815f..f62815f 100644 --- a/arch/i386/kernel/trampoline_32.S +++ b/arch/x86/kernel/trampoline_32.S diff --git a/arch/i386/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 47b0bef..47b0bef 100644 --- a/arch/i386/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c diff --git a/arch/i386/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index a39280b..a39280b 100644 --- a/arch/i386/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c diff --git a/arch/i386/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index 1242462..1242462 100644 --- a/arch/i386/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c diff --git a/arch/i386/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c index f2dcd1d..f2dcd1d 100644 --- a/arch/i386/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c diff --git a/arch/i386/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index 18673e0..18673e0 100644 --- a/arch/i386/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c diff --git a/arch/i386/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c index b1b5ab0..b1b5ab0 100644 --- a/arch/i386/kernel/vmiclock_32.c +++ b/arch/x86/kernel/vmiclock_32.c diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 849ee61..849ee61 100644 --- a/arch/i386/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S diff --git a/arch/i386/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index 7d72cce..7d72cce 100644 --- a/arch/i386/kernel/vmlinux_32.lds.S +++ b/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 index 103cab6..103cab6 100644 --- a/arch/i386/kernel/vsyscall-int80_32.S +++ b/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 index fcf376a..fcf376a 100644 --- a/arch/i386/kernel/vsyscall-note_32.S +++ b/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 index a92262f..a92262f 100644 --- a/arch/i386/kernel/vsyscall-sigreturn_32.S +++ b/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 index ed879bf..ed879bf 100644 --- a/arch/i386/kernel/vsyscall-sysenter_32.S +++ b/arch/x86/kernel/vsyscall-sysenter_32.S diff --git a/arch/i386/kernel/vsyscall_32.S b/arch/x86/kernel/vsyscall_32.S index 0330744..a5ab3dc 100644 --- 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 index 4a8b0ed..4a8b0ed 100644 --- a/arch/i386/kernel/vsyscall_32.lds.S +++ b/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 --- 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 --- 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 --- 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 --- 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 --- 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 |