diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:12:19 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:12:19 -0400 |
| commit | 77399ad90a8bd05f4b16da2ee398062d89f1719c (patch) | |
| tree | eb0f57069909c6b3db2a5ebd600518ad060757fb | |
| parent | 45da5aa2352153c7523dd42bb54e9378995b2194 (diff) | |
i386: 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/i386/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/nmi_32.c (renamed from arch/i386/kernel/nmi.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 2d22e13ecfd8..4967012119ae 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
| @@ -22,7 +22,7 @@ obj-$(CONFIG_X86_SMP) += smp_32.o smpboot.o tsc_sync.o | |||
| 22 | obj-$(CONFIG_SMP) += smpcommon.o | 22 | obj-$(CONFIG_SMP) += smpcommon.o |
| 23 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o | 23 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o |
| 24 | obj-$(CONFIG_X86_MPPARSE) += mpparse.o | 24 | obj-$(CONFIG_X86_MPPARSE) += mpparse.o |
| 25 | obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi.o | 25 | obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi_32.o |
| 26 | obj-$(CONFIG_X86_IO_APIC) += io_apic_32.o | 26 | obj-$(CONFIG_X86_IO_APIC) += io_apic_32.o |
| 27 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups.o | 27 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups.o |
| 28 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash_32.o | 28 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash_32.o |
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi_32.c index c7227e2180f8..c7227e2180f8 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi_32.c | |||