diff --git a/[refs] b/[refs]
index df9046c155cd..9677fab2ff1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c76e79e010a8c48a95cfa947e192c40cdae23f7e
+refs/heads/master: 5d0c9ec6dd7204e5895260d83a90c5a0d64143f7
diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile
index c76351c13bdd..97de9cbd3b7f 100644
--- 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.o
+head-y := arch/x86_64/kernel/head.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
index ddc3154b7c29..ce02b64bb261 100644
--- 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.o vmlinux.lds
+extra-y 	:= head.o head64.o init_task_64.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
 obj-y	:= process.o signal_64.o entry.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/init_task.c b/trunk/arch/x86_64/kernel/init_task_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/init_task.c
rename to trunk/arch/x86_64/kernel/init_task_64.c