diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:11:59 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:11:59 -0400 |
| commit | 5250d969f281b9f1ca581245a8797a5b7055c959 (patch) | |
| tree | f5f15c30ec8ca3b9e114c3ce1b868841d85c43be /arch/i386 | |
| parent | 185bfbf6fac3e5bf8cd19c84aa520438a7d70022 (diff) | |
i386: prepare shared kernel/relocate_kernel.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/relocate_kernel_32.S (renamed from arch/i386/kernel/relocate_kernel.S) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 559f1f77185b..a677aaba33cd 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
| @@ -25,7 +25,7 @@ obj-$(CONFIG_X86_MPPARSE) += mpparse.o | |||
| 25 | obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o | 25 | obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.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.o crash.o | 28 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash.o |
| 29 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o | 29 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o |
| 30 | obj-$(CONFIG_X86_NUMAQ) += numaq.o | 30 | obj-$(CONFIG_X86_NUMAQ) += numaq.o |
| 31 | obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o | 31 | obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o |
diff --git a/arch/i386/kernel/relocate_kernel.S b/arch/i386/kernel/relocate_kernel_32.S index f151d6fae462..f151d6fae462 100644 --- a/arch/i386/kernel/relocate_kernel.S +++ b/arch/i386/kernel/relocate_kernel_32.S | |||