diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:12:56 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:12:56 +0200 |
| commit | 826c0e9e6ced6c1bb2d3f067ddff93d706b86446 (patch) | |
| tree | 5c5d00d9081a07d1b5bb284b681fea88153882cc /arch/i386/kernel | |
| parent | b352b7fe2271c48600a71f50546b8a3567a0e7fe (diff) | |
i386: prepare shared kernel/trampoline.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/trampoline_32.S (renamed from arch/i386/kernel/trampoline.S) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index c718afe9545..4d7a8e8dc44 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -20,7 +20,7 @@ obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_APM) += apm_32.o obj-$(CONFIG_X86_SMP) += smp_32.o smpboot_32.o tsc_sync.o obj-$(CONFIG_SMP) += smpcommon_32.o -obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o +obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_32.o obj-$(CONFIG_X86_MPPARSE) += mpparse_32.o obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi_32.o obj-$(CONFIG_X86_IO_APIC) += io_apic_32.o diff --git a/arch/i386/kernel/trampoline.S b/arch/i386/kernel/trampoline_32.S index f62815f8d06..f62815f8d06 100644 --- a/arch/i386/kernel/trampoline.S +++ b/arch/i386/kernel/trampoline_32.S |