diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:14:24 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:14:24 -0400 |
commit | 5b8d883929091c647635392bafc8fc0962d4b43f (patch) | |
tree | e3e13e5d16e9d5dd8dee0fa69ff8f367016ae6ef | |
parent | bd751ae043e89e2e44e6af784df5a70694b1c9b7 (diff) |
x86_64: prepare shared kernel/nmi.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86_64/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/nmi_64.c (renamed from arch/x86_64/kernel/nmi.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index b4e36e69150e..fbaba5335b66 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile | |||
@@ -21,7 +21,7 @@ obj-$(CONFIG_X86_MSR) += msr.o | |||
21 | obj-$(CONFIG_MICROCODE) += microcode.o | 21 | obj-$(CONFIG_MICROCODE) += microcode.o |
22 | obj-$(CONFIG_X86_CPUID) += cpuid.o | 22 | obj-$(CONFIG_X86_CPUID) += cpuid.o |
23 | obj-$(CONFIG_SMP) += smp_64.o smpboot.o trampoline.o tsc_sync.o | 23 | obj-$(CONFIG_SMP) += smp_64.o smpboot.o trampoline.o tsc_sync.o |
24 | obj-y += apic_64.o nmi.o | 24 | obj-y += apic_64.o nmi_64.o |
25 | obj-y += io_apic_64.o mpparse.o genapic.o genapic_flat.o | 25 | obj-y += io_apic_64.o mpparse.o genapic.o genapic_flat.o |
26 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o | 26 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o |
27 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o | 27 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o |
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi_64.c index 0ec6d2ddb931..0ec6d2ddb931 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi_64.c | |||