summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/Makefile2
-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 b4e36e6..fbaba53 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -21,7 +21,7 @@ obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_SMP) += smp_64.o smpboot.o trampoline.o tsc_sync.o
-obj-y += apic_64.o nmi.o
+obj-y += apic_64.o nmi_64.o
obj-y += io_apic_64.o mpparse.o genapic.o genapic_flat.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o
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 0ec6d2d..0ec6d2d 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi_64.c
OpenPOWER on IntegriCloud