From 250c22777fe1ccd7ac588579a6c16db4c0161cc5 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:17:24 +0200 Subject: [PATCH] x86_64: move kernel Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/head_64.S | 2 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/Makefile_32 | 2 -- arch/{x86_64 => x86}/kernel/Makefile_64 | 9 --------- arch/x86/kernel/acpi/wakeup_64.S | 2 +- arch/{x86_64 => x86}/kernel/aperture_64.c | 0 arch/{x86_64 => x86}/kernel/apic_64.c | 0 arch/{x86_64 => x86}/kernel/asm-offsets_64.c | 0 arch/{x86_64 => x86}/kernel/audit_64.c | 0 arch/{x86_64 => x86}/kernel/bugs_64.c | 0 arch/{x86_64 => x86}/kernel/crash_64.c | 0 arch/{x86_64 => x86}/kernel/crash_dump_64.c | 0 arch/{x86_64 => x86}/kernel/e820_64.c | 0 arch/{x86_64 => x86}/kernel/early-quirks_64.c | 0 arch/{x86_64 => x86}/kernel/early_printk.c | 0 arch/{x86_64 => x86}/kernel/entry_64.S | 0 arch/{x86_64 => x86}/kernel/genapic_64.c | 0 arch/{x86_64 => x86}/kernel/genapic_flat_64.c | 0 arch/{x86_64 => x86}/kernel/head64.c | 0 arch/{x86_64 => x86}/kernel/head_64.S | 0 arch/{x86_64 => x86}/kernel/hpet_64.c | 0 arch/{x86_64 => x86}/kernel/i387_64.c | 0 arch/{x86_64 => x86}/kernel/i8259_64.c | 0 arch/{x86_64 => x86}/kernel/init_task_64.c | 0 arch/{x86_64 => x86}/kernel/io_apic_64.c | 0 arch/{x86_64 => x86}/kernel/ioport_64.c | 0 arch/{x86_64 => x86}/kernel/irq_64.c | 0 arch/{x86_64 => x86}/kernel/k8.c | 0 arch/{x86_64 => x86}/kernel/kprobes_64.c | 0 arch/{x86_64 => x86}/kernel/ldt_64.c | 0 arch/{x86_64 => x86}/kernel/machine_kexec_64.c | 0 arch/{x86_64 => x86}/kernel/mce_64.c | 0 arch/{x86_64 => x86}/kernel/mce_amd_64.c | 0 arch/{x86_64 => x86}/kernel/mce_intel_64.c | 0 arch/{x86_64 => x86}/kernel/module_64.c | 0 arch/{x86_64 => x86}/kernel/mpparse_64.c | 0 arch/{x86_64 => x86}/kernel/nmi_64.c | 0 arch/{x86_64 => x86}/kernel/pci-calgary_64.c | 0 arch/{x86_64 => x86}/kernel/pci-dma_64.c | 0 arch/{x86_64 => x86}/kernel/pci-gart_64.c | 0 arch/{x86_64 => x86}/kernel/pci-nommu_64.c | 0 arch/{x86_64 => x86}/kernel/pci-swiotlb_64.c | 0 arch/{x86_64 => x86}/kernel/pmtimer_64.c | 0 arch/{x86_64 => x86}/kernel/process_64.c | 0 arch/{x86_64 => x86}/kernel/ptrace_64.c | 0 arch/{x86_64 => x86}/kernel/reboot_64.c | 0 arch/{x86_64 => x86}/kernel/relocate_kernel_64.S | 0 arch/{x86_64 => x86}/kernel/setup64.c | 0 arch/{x86_64 => x86}/kernel/setup_64.c | 0 arch/{x86_64 => x86}/kernel/signal_64.c | 0 arch/{x86_64 => x86}/kernel/smp_64.c | 0 arch/{x86_64 => x86}/kernel/smpboot_64.c | 0 arch/{x86_64 => x86}/kernel/stacktrace.c | 0 arch/{x86_64 => x86}/kernel/suspend_64.c | 0 arch/{x86_64 => x86}/kernel/suspend_asm_64.S | 0 arch/{x86_64 => x86}/kernel/sys_x86_64.c | 0 arch/{x86_64 => x86}/kernel/syscall_64.c | 0 arch/{x86_64 => x86}/kernel/tce_64.c | 0 arch/{x86_64 => x86}/kernel/time_64.c | 0 arch/{x86_64 => x86}/kernel/trampoline_64.S | 0 arch/{x86_64 => x86}/kernel/traps_64.c | 0 arch/{x86_64 => x86}/kernel/tsc_64.c | 0 arch/{x86_64 => x86}/kernel/tsc_sync.c | 0 arch/{x86_64 => x86}/kernel/verify_cpu_64.S | 0 arch/{x86_64 => x86}/kernel/vmlinux_64.lds.S | 0 arch/{x86_64 => x86}/kernel/vsmp_64.c | 0 arch/{x86_64 => x86}/kernel/vsyscall_64.c | 0 arch/{x86_64 => x86}/kernel/x8664_ksyms_64.c | 0 arch/x86_64/Makefile | 11 +++++++++-- arch/x86_64/kernel/Makefile | 5 ----- arch/x86_64/kernel/asm-offsets.c | 5 ----- arch/x86_64/kernel/vmlinux.lds.S | 5 ----- 72 files changed, 12 insertions(+), 31 deletions(-) rename arch/{x86_64 => x86}/kernel/Makefile_64 (81%) rename arch/{x86_64 => x86}/kernel/aperture_64.c (100%) rename arch/{x86_64 => x86}/kernel/apic_64.c (100%) rename arch/{x86_64 => x86}/kernel/asm-offsets_64.c (100%) rename arch/{x86_64 => x86}/kernel/audit_64.c (100%) rename arch/{x86_64 => x86}/kernel/bugs_64.c (100%) rename arch/{x86_64 => x86}/kernel/crash_64.c (100%) rename arch/{x86_64 => x86}/kernel/crash_dump_64.c (100%) rename arch/{x86_64 => x86}/kernel/e820_64.c (100%) rename arch/{x86_64 => x86}/kernel/early-quirks_64.c (100%) rename arch/{x86_64 => x86}/kernel/early_printk.c (100%) rename arch/{x86_64 => x86}/kernel/entry_64.S (100%) rename arch/{x86_64 => x86}/kernel/genapic_64.c (100%) rename arch/{x86_64 => x86}/kernel/genapic_flat_64.c (100%) rename arch/{x86_64 => x86}/kernel/head64.c (100%) rename arch/{x86_64 => x86}/kernel/head_64.S (100%) rename arch/{x86_64 => x86}/kernel/hpet_64.c (100%) rename arch/{x86_64 => x86}/kernel/i387_64.c (100%) rename arch/{x86_64 => x86}/kernel/i8259_64.c (100%) rename arch/{x86_64 => x86}/kernel/init_task_64.c (100%) rename arch/{x86_64 => x86}/kernel/io_apic_64.c (100%) rename arch/{x86_64 => x86}/kernel/ioport_64.c (100%) rename arch/{x86_64 => x86}/kernel/irq_64.c (100%) rename arch/{x86_64 => x86}/kernel/k8.c (100%) rename arch/{x86_64 => x86}/kernel/kprobes_64.c (100%) rename arch/{x86_64 => x86}/kernel/ldt_64.c (100%) rename arch/{x86_64 => x86}/kernel/machine_kexec_64.c (100%) rename arch/{x86_64 => x86}/kernel/mce_64.c (100%) rename arch/{x86_64 => x86}/kernel/mce_amd_64.c (100%) rename arch/{x86_64 => x86}/kernel/mce_intel_64.c (100%) rename arch/{x86_64 => x86}/kernel/module_64.c (100%) rename arch/{x86_64 => x86}/kernel/mpparse_64.c (100%) rename arch/{x86_64 => x86}/kernel/nmi_64.c (100%) rename arch/{x86_64 => x86}/kernel/pci-calgary_64.c (100%) rename arch/{x86_64 => x86}/kernel/pci-dma_64.c (100%) rename arch/{x86_64 => x86}/kernel/pci-gart_64.c (100%) rename arch/{x86_64 => x86}/kernel/pci-nommu_64.c (100%) rename arch/{x86_64 => x86}/kernel/pci-swiotlb_64.c (100%) rename arch/{x86_64 => x86}/kernel/pmtimer_64.c (100%) rename arch/{x86_64 => x86}/kernel/process_64.c (100%) rename arch/{x86_64 => x86}/kernel/ptrace_64.c (100%) rename arch/{x86_64 => x86}/kernel/reboot_64.c (100%) rename arch/{x86_64 => x86}/kernel/relocate_kernel_64.S (100%) rename arch/{x86_64 => x86}/kernel/setup64.c (100%) rename arch/{x86_64 => x86}/kernel/setup_64.c (100%) rename arch/{x86_64 => x86}/kernel/signal_64.c (100%) rename arch/{x86_64 => x86}/kernel/smp_64.c (100%) rename arch/{x86_64 => x86}/kernel/smpboot_64.c (100%) rename arch/{x86_64 => x86}/kernel/stacktrace.c (100%) rename arch/{x86_64 => x86}/kernel/suspend_64.c (100%) rename arch/{x86_64 => x86}/kernel/suspend_asm_64.S (100%) rename arch/{x86_64 => x86}/kernel/sys_x86_64.c (100%) rename arch/{x86_64 => x86}/kernel/syscall_64.c (100%) rename arch/{x86_64 => x86}/kernel/tce_64.c (100%) rename arch/{x86_64 => x86}/kernel/time_64.c (100%) rename arch/{x86_64 => x86}/kernel/trampoline_64.S (100%) rename arch/{x86_64 => x86}/kernel/traps_64.c (100%) rename arch/{x86_64 => x86}/kernel/tsc_64.c (100%) rename arch/{x86_64 => x86}/kernel/tsc_sync.c (100%) rename arch/{x86_64 => x86}/kernel/verify_cpu_64.S (100%) rename arch/{x86_64 => x86}/kernel/vmlinux_64.lds.S (100%) rename arch/{x86_64 => x86}/kernel/vsmp_64.c (100%) rename arch/{x86_64 => x86}/kernel/vsyscall_64.c (100%) rename arch/{x86_64 => x86}/kernel/x8664_ksyms_64.c (100%) delete mode 100644 arch/x86_64/kernel/Makefile delete mode 100644 arch/x86_64/kernel/asm-offsets.c delete mode 100644 arch/x86_64/kernel/vmlinux.lds.S diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index cff3d1dc5dd..49467640751 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S @@ -174,7 +174,7 @@ no_longmode: hlt jmp 1b -#include "../../../x86_64/kernel/verify_cpu_64.S" +#include "../../kernel/verify_cpu_64.S" /* Be careful here startup_64 needs to be at a predictable * address so I can export it in an ELF header. Bootloaders diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 577d08f4b8b..45855c97923 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) include ${srctree}/arch/x86/kernel/Makefile_32 else -include ${srctree}/arch/x86_64/kernel/Makefile_64 +include ${srctree}/arch/x86/kernel/Makefile_64 endif diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32 index 5096f486d38..cb25523026a 100644 --- a/arch/x86/kernel/Makefile_32 +++ b/arch/x86/kernel/Makefile_32 @@ -83,6 +83,4 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note_32.o FORCE $(call if_changed,syscall) -k8-y += ../../x86_64/kernel/k8.o -stacktrace-y += ../../x86_64/kernel/stacktrace.o diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 similarity index 81% rename from arch/x86_64/kernel/Makefile_64 rename to arch/x86/kernel/Makefile_64 index 120d4e51fd4..6e6b5909e46 100644 --- a/arch/x86_64/kernel/Makefile_64 +++ b/arch/x86/kernel/Makefile_64 @@ -49,15 +49,6 @@ obj-y += pcspeaker.o CFLAGS_vsyscall_64.o := $(PROFILING) -g0 therm_throt-y += ../../x86/kernel/cpu/mcheck/therm_throt.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 += ../../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 diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index 5e3b3f5496c..8b4357e1efe 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -269,7 +269,7 @@ no_longmode: movb $0xbc,%al ; outb %al,$0x80 jmp no_longmode -#include "../../../x86_64/kernel/verify_cpu_64.S" +#include "../verify_cpu_64.S" /* This code uses an extended set of video mode numbers. These include: * Aliases for standard modes diff --git a/arch/x86_64/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c similarity index 100% rename from arch/x86_64/kernel/aperture_64.c rename to arch/x86/kernel/aperture_64.c diff --git a/arch/x86_64/kernel/apic_64.c b/arch/x86/kernel/apic_64.c similarity index 100% rename from arch/x86_64/kernel/apic_64.c rename to arch/x86/kernel/apic_64.c diff --git a/arch/x86_64/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c similarity index 100% rename from arch/x86_64/kernel/asm-offsets_64.c rename to arch/x86/kernel/asm-offsets_64.c diff --git a/arch/x86_64/kernel/audit_64.c b/arch/x86/kernel/audit_64.c similarity index 100% rename from arch/x86_64/kernel/audit_64.c rename to arch/x86/kernel/audit_64.c diff --git a/arch/x86_64/kernel/bugs_64.c b/arch/x86/kernel/bugs_64.c similarity index 100% rename from arch/x86_64/kernel/bugs_64.c rename to arch/x86/kernel/bugs_64.c diff --git a/arch/x86_64/kernel/crash_64.c b/arch/x86/kernel/crash_64.c similarity index 100% rename from arch/x86_64/kernel/crash_64.c rename to arch/x86/kernel/crash_64.c diff --git a/arch/x86_64/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c similarity index 100% rename from arch/x86_64/kernel/crash_dump_64.c rename to arch/x86/kernel/crash_dump_64.c diff --git a/arch/x86_64/kernel/e820_64.c b/arch/x86/kernel/e820_64.c similarity index 100% rename from arch/x86_64/kernel/e820_64.c rename to arch/x86/kernel/e820_64.c diff --git a/arch/x86_64/kernel/early-quirks_64.c b/arch/x86/kernel/early-quirks_64.c similarity index 100% rename from arch/x86_64/kernel/early-quirks_64.c rename to arch/x86/kernel/early-quirks_64.c diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86/kernel/early_printk.c similarity index 100% rename from arch/x86_64/kernel/early_printk.c rename to arch/x86/kernel/early_printk.c diff --git a/arch/x86_64/kernel/entry_64.S b/arch/x86/kernel/entry_64.S similarity index 100% rename from arch/x86_64/kernel/entry_64.S rename to arch/x86/kernel/entry_64.S diff --git a/arch/x86_64/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c similarity index 100% rename from arch/x86_64/kernel/genapic_64.c rename to arch/x86/kernel/genapic_64.c diff --git a/arch/x86_64/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c similarity index 100% rename from arch/x86_64/kernel/genapic_flat_64.c rename to arch/x86/kernel/genapic_flat_64.c diff --git a/arch/x86_64/kernel/head64.c b/arch/x86/kernel/head64.c similarity index 100% rename from arch/x86_64/kernel/head64.c rename to arch/x86/kernel/head64.c diff --git a/arch/x86_64/kernel/head_64.S b/arch/x86/kernel/head_64.S similarity index 100% rename from arch/x86_64/kernel/head_64.S rename to arch/x86/kernel/head_64.S diff --git a/arch/x86_64/kernel/hpet_64.c b/arch/x86/kernel/hpet_64.c similarity index 100% rename from arch/x86_64/kernel/hpet_64.c rename to arch/x86/kernel/hpet_64.c diff --git a/arch/x86_64/kernel/i387_64.c b/arch/x86/kernel/i387_64.c similarity index 100% rename from arch/x86_64/kernel/i387_64.c rename to arch/x86/kernel/i387_64.c diff --git a/arch/x86_64/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c similarity index 100% rename from arch/x86_64/kernel/i8259_64.c rename to arch/x86/kernel/i8259_64.c diff --git a/arch/x86_64/kernel/init_task_64.c b/arch/x86/kernel/init_task_64.c similarity index 100% rename from arch/x86_64/kernel/init_task_64.c rename to arch/x86/kernel/init_task_64.c diff --git a/arch/x86_64/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c similarity index 100% rename from arch/x86_64/kernel/io_apic_64.c rename to arch/x86/kernel/io_apic_64.c diff --git a/arch/x86_64/kernel/ioport_64.c b/arch/x86/kernel/ioport_64.c similarity index 100% rename from arch/x86_64/kernel/ioport_64.c rename to arch/x86/kernel/ioport_64.c diff --git a/arch/x86_64/kernel/irq_64.c b/arch/x86/kernel/irq_64.c similarity index 100% rename from arch/x86_64/kernel/irq_64.c rename to arch/x86/kernel/irq_64.c diff --git a/arch/x86_64/kernel/k8.c b/arch/x86/kernel/k8.c similarity index 100% rename from arch/x86_64/kernel/k8.c rename to arch/x86/kernel/k8.c diff --git a/arch/x86_64/kernel/kprobes_64.c b/arch/x86/kernel/kprobes_64.c similarity index 100% rename from arch/x86_64/kernel/kprobes_64.c rename to arch/x86/kernel/kprobes_64.c diff --git a/arch/x86_64/kernel/ldt_64.c b/arch/x86/kernel/ldt_64.c similarity index 100% rename from arch/x86_64/kernel/ldt_64.c rename to arch/x86/kernel/ldt_64.c diff --git a/arch/x86_64/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c similarity index 100% rename from arch/x86_64/kernel/machine_kexec_64.c rename to arch/x86/kernel/machine_kexec_64.c diff --git a/arch/x86_64/kernel/mce_64.c b/arch/x86/kernel/mce_64.c similarity index 100% rename from arch/x86_64/kernel/mce_64.c rename to arch/x86/kernel/mce_64.c diff --git a/arch/x86_64/kernel/mce_amd_64.c b/arch/x86/kernel/mce_amd_64.c similarity index 100% rename from arch/x86_64/kernel/mce_amd_64.c rename to arch/x86/kernel/mce_amd_64.c diff --git a/arch/x86_64/kernel/mce_intel_64.c b/arch/x86/kernel/mce_intel_64.c similarity index 100% rename from arch/x86_64/kernel/mce_intel_64.c rename to arch/x86/kernel/mce_intel_64.c diff --git a/arch/x86_64/kernel/module_64.c b/arch/x86/kernel/module_64.c similarity index 100% rename from arch/x86_64/kernel/module_64.c rename to arch/x86/kernel/module_64.c diff --git a/arch/x86_64/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c similarity index 100% rename from arch/x86_64/kernel/mpparse_64.c rename to arch/x86/kernel/mpparse_64.c diff --git a/arch/x86_64/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c similarity index 100% rename from arch/x86_64/kernel/nmi_64.c rename to arch/x86/kernel/nmi_64.c diff --git a/arch/x86_64/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c similarity index 100% rename from arch/x86_64/kernel/pci-calgary_64.c rename to arch/x86/kernel/pci-calgary_64.c diff --git a/arch/x86_64/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c similarity index 100% rename from arch/x86_64/kernel/pci-dma_64.c rename to arch/x86/kernel/pci-dma_64.c diff --git a/arch/x86_64/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c similarity index 100% rename from arch/x86_64/kernel/pci-gart_64.c rename to arch/x86/kernel/pci-gart_64.c diff --git a/arch/x86_64/kernel/pci-nommu_64.c b/arch/x86/kernel/pci-nommu_64.c similarity index 100% rename from arch/x86_64/kernel/pci-nommu_64.c rename to arch/x86/kernel/pci-nommu_64.c diff --git a/arch/x86_64/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c similarity index 100% rename from arch/x86_64/kernel/pci-swiotlb_64.c rename to arch/x86/kernel/pci-swiotlb_64.c diff --git a/arch/x86_64/kernel/pmtimer_64.c b/arch/x86/kernel/pmtimer_64.c similarity index 100% rename from arch/x86_64/kernel/pmtimer_64.c rename to arch/x86/kernel/pmtimer_64.c diff --git a/arch/x86_64/kernel/process_64.c b/arch/x86/kernel/process_64.c similarity index 100% rename from arch/x86_64/kernel/process_64.c rename to arch/x86/kernel/process_64.c diff --git a/arch/x86_64/kernel/ptrace_64.c b/arch/x86/kernel/ptrace_64.c similarity index 100% rename from arch/x86_64/kernel/ptrace_64.c rename to arch/x86/kernel/ptrace_64.c diff --git a/arch/x86_64/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c similarity index 100% rename from arch/x86_64/kernel/reboot_64.c rename to arch/x86/kernel/reboot_64.c diff --git a/arch/x86_64/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S similarity index 100% rename from arch/x86_64/kernel/relocate_kernel_64.S rename to arch/x86/kernel/relocate_kernel_64.S diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86/kernel/setup64.c similarity index 100% rename from arch/x86_64/kernel/setup64.c rename to arch/x86/kernel/setup64.c diff --git a/arch/x86_64/kernel/setup_64.c b/arch/x86/kernel/setup_64.c similarity index 100% rename from arch/x86_64/kernel/setup_64.c rename to arch/x86/kernel/setup_64.c diff --git a/arch/x86_64/kernel/signal_64.c b/arch/x86/kernel/signal_64.c similarity index 100% rename from arch/x86_64/kernel/signal_64.c rename to arch/x86/kernel/signal_64.c diff --git a/arch/x86_64/kernel/smp_64.c b/arch/x86/kernel/smp_64.c similarity index 100% rename from arch/x86_64/kernel/smp_64.c rename to arch/x86/kernel/smp_64.c diff --git a/arch/x86_64/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c similarity index 100% rename from arch/x86_64/kernel/smpboot_64.c rename to arch/x86/kernel/smpboot_64.c diff --git a/arch/x86_64/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c similarity index 100% rename from arch/x86_64/kernel/stacktrace.c rename to arch/x86/kernel/stacktrace.c diff --git a/arch/x86_64/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c similarity index 100% rename from arch/x86_64/kernel/suspend_64.c rename to arch/x86/kernel/suspend_64.c diff --git a/arch/x86_64/kernel/suspend_asm_64.S b/arch/x86/kernel/suspend_asm_64.S similarity index 100% rename from arch/x86_64/kernel/suspend_asm_64.S rename to arch/x86/kernel/suspend_asm_64.S diff --git a/arch/x86_64/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c similarity index 100% rename from arch/x86_64/kernel/sys_x86_64.c rename to arch/x86/kernel/sys_x86_64.c diff --git a/arch/x86_64/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c similarity index 100% rename from arch/x86_64/kernel/syscall_64.c rename to arch/x86/kernel/syscall_64.c diff --git a/arch/x86_64/kernel/tce_64.c b/arch/x86/kernel/tce_64.c similarity index 100% rename from arch/x86_64/kernel/tce_64.c rename to arch/x86/kernel/tce_64.c diff --git a/arch/x86_64/kernel/time_64.c b/arch/x86/kernel/time_64.c similarity index 100% rename from arch/x86_64/kernel/time_64.c rename to arch/x86/kernel/time_64.c diff --git a/arch/x86_64/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S similarity index 100% rename from arch/x86_64/kernel/trampoline_64.S rename to arch/x86/kernel/trampoline_64.S diff --git a/arch/x86_64/kernel/traps_64.c b/arch/x86/kernel/traps_64.c similarity index 100% rename from arch/x86_64/kernel/traps_64.c rename to arch/x86/kernel/traps_64.c diff --git a/arch/x86_64/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c similarity index 100% rename from arch/x86_64/kernel/tsc_64.c rename to arch/x86/kernel/tsc_64.c diff --git a/arch/x86_64/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c similarity index 100% rename from arch/x86_64/kernel/tsc_sync.c rename to arch/x86/kernel/tsc_sync.c diff --git a/arch/x86_64/kernel/verify_cpu_64.S b/arch/x86/kernel/verify_cpu_64.S similarity index 100% rename from arch/x86_64/kernel/verify_cpu_64.S rename to arch/x86/kernel/verify_cpu_64.S diff --git a/arch/x86_64/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S similarity index 100% rename from arch/x86_64/kernel/vmlinux_64.lds.S rename to arch/x86/kernel/vmlinux_64.lds.S diff --git a/arch/x86_64/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c similarity index 100% rename from arch/x86_64/kernel/vsmp_64.c rename to arch/x86/kernel/vsmp_64.c diff --git a/arch/x86_64/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c similarity index 100% rename from arch/x86_64/kernel/vsyscall_64.c rename to arch/x86/kernel/vsyscall_64.c diff --git a/arch/x86_64/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c similarity index 100% rename from arch/x86_64/kernel/x8664_ksyms_64.c rename to arch/x86/kernel/x8664_ksyms_64.c diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 189d80d3a89..afaf0f99887 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile @@ -21,6 +21,13 @@ # # $Id: Makefile,v 1.31 2002/03/22 15:56:07 ak Exp $ +# Fill in SRCARCH +SRCARCH := x86 + +archprepare: + @mkdir -p ${objtree}/arch/x86/kernel + + LDFLAGS := -m elf_x86_64 OBJCOPYFLAGS := -O binary -R .note -R .comment -S LDFLAGS_vmlinux := @@ -71,10 +78,10 @@ CFLAGS += $(cflags-y) CFLAGS_KERNEL += $(cflags-kernel-y) AFLAGS += -m64 -head-y := arch/x86_64/kernel/head_64.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task_64.o +head-y := arch/x86/kernel/head_64.o arch/x86/kernel/head64.o arch/x86/kernel/init_task_64.o libs-y += arch/x86/lib/ -core-y += arch/x86_64/kernel/ \ +core-y += arch/x86/kernel/ \ arch/x86/mm/ \ arch/x86/crypto/ \ arch/x86/vdso/ diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile deleted file mode 100644 index 577d08f4b8b..00000000000 --- a/arch/x86_64/kernel/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/x86/kernel/Makefile_32 -else -include ${srctree}/arch/x86_64/kernel/Makefile_64 -endif diff --git a/arch/x86_64/kernel/asm-offsets.c b/arch/x86_64/kernel/asm-offsets.c deleted file mode 100644 index cfa82c899f4..00000000000 --- a/arch/x86_64/kernel/asm-offsets.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef CONFIG_X86_32 -# include "asm-offsets_32.c" -#else -# include "asm-offsets_64.c" -#endif diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S deleted file mode 100644 index 849ee611f01..00000000000 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef CONFIG_X86_32 -# include "vmlinux_32.lds.S" -#else -# include "vmlinux_64.lds.S" -#endif -- 2.11.4.GIT