summaryrefslogtreecommitdiff
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:15:17 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:15:17 +0200
commit977d5654cb630d6845b84a984fb5698e839f20f2 (patch)
treef5cfd7c4f4c72b97765a76298722b037e5d89418 /arch/x86_64/kernel
parent13c4896799d1610956f307534aa22d644b92bee7 (diff)
x86_64: 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/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/head_64.S (renamed from arch/x86_64/kernel/head.S)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 2c0e778e8acf..b65abc2a15a4 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -2,7 +2,7 @@
# Makefile for the linux kernel.
#
-extra-y := head.o head64.o init_task_64.o vmlinux.lds
+extra-y := head_64.o head64.o init_task_64.o vmlinux.lds
EXTRA_AFLAGS := -traditional
obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head_64.S
index b6167fe3330e..b6167fe3330e 100644
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86_64/kernel/head_64.S