aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:15:14 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:15:14 +0200
commit8e59c31a0af824ddb158a7007faa66fc8ca4dbe4 (patch)
tree27ed81344d9fa58456b2a8e91e37b5e6cb798153 /arch/x86_64/kernel
parent2a232a7656c085ecde659dc1dbaf65cc4fbf7ed7 (diff)
x86_64: prepare shared kernel/entry.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/entry_64.S (renamed from arch/x86_64/kernel/entry.S)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index da65eb3a6b5..40288502910 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -4,7 +4,7 @@
extra-y := head.o head64.o init_task_64.o vmlinux.lds
EXTRA_AFLAGS := -traditional
-obj-y := process_64.o signal_64.o entry.o traps_64.o irq_64.o \
+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 \
x8664_ksyms_64.o i387_64.o syscall.o vsyscall_64.o \
setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry_64.S
index 1d232e5f565..1d232e5f565 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry_64.S