---

yaml --- r: 65499 b: refs/heads/master c: 977d565 h: refs/heads/master i: 65497: afbd90b 65495: c1f278e v: v3
git-mirror · Oct 11, 2007 · 66502c3 · 66502c3
1 parent 9f53dcb
commit 66502c3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13c4896799d1610956f307534aa22d644b92bee7
+refs/heads/master: 977d5654cb630d6845b84a984fb5698e839f20f2
diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile
@@ -71,7 +71,7 @@ CFLAGS += $(cflags-y)
 CFLAGS_KERNEL += $(cflags-kernel-y)
 AFLAGS += -m64
 
-head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task_64.o
+head-y := arch/x86_64/kernel/head_64.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task_64.o
 
 libs-y 					+= arch/x86_64/lib/
 core-y					+= arch/x86_64/kernel/ \

diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/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/trunk/arch/x86_64/kernel/head.S → trunk/arch/x86_64/kernel/head_64.S b/trunk/arch/x86_64/kernel/head.S → trunk/arch/x86_64/kernel/head_64.S