summaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 13:13:10 +0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 13:13:10 +0400
commitdeb8677148fef3aea11edd4e980f6eb9c564f3cd (patch)
tree25e1f8b0fd56203c92fbaf715b27a841d4e990f0 /arch/i386
parent76ea2ec68b54acc13ee1bfbb9a4e3aad370a374f (diff)
downloadlinux-deb8677148fef3aea11edd4e980f6eb9c564f3cd.tar.xz
i386: prepare shared kernel/head.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/Makefile2
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/head_32.S (renamed from arch/i386/kernel/head.S)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 56ea4250f982..45409c13f6ef 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -99,7 +99,7 @@ core-$(CONFIG_XEN) += arch/i386/xen/
# default subarch .h files
mflags-y += -Iinclude/asm-i386/mach-default
-head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task_32.o
+head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
libs-y += arch/i386/lib/
core-y += arch/i386/kernel/ \
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index d5367aa2510d..6ecf97da63b0 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -2,7 +2,7 @@
# Makefile for the linux kernel.
#
-extra-y := head.o init_task_32.o vmlinux.lds
+extra-y := head_32.o init_task_32.o vmlinux.lds
obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head_32.S
index 8f0382161c91..8f0382161c91 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head_32.S