diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:01 +0200 |
| commit | 9a163ed8e0552fdcffe405d2ea7134819a81456e (patch) | |
| tree | b322fd2afbb812ba7ddfd22f3734aaab007c2aa5 /arch/x86_64 | |
| parent | f7627e2513987bb5d4e8cb13c4e0a478352141ac (diff) | |
| download | talos-op-linux-9a163ed8e0552fdcffe405d2ea7134819a81456e.tar.gz talos-op-linux-9a163ed8e0552fdcffe405d2ea7134819a81456e.zip | |
i386: move kernel
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86_64')
| -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 |
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86_64/ia32/vsyscall-sigreturn.S index 83e7fd683c3d..b383be00baec 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 d3ebd1699826..577d08f4b8bb 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 690aebf37c37..3a204cc599d7 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 |
