diff --git a/[refs] b/[refs] index f581ea63fa47..ce61d372918a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6505ca668b2c21c06abb7bb96a8272a6f83411f +refs/heads/master: bd4c1b5baacbc7e4257c00f087abfd3f7aef2dfb diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index d50ba296437c..976ea5e7222b 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/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.o signal_64.o entry.o traps_64.o irq_64.o \ +obj-y := process_64.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 \ 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/trunk/arch/x86_64/kernel/process.c b/trunk/arch/x86_64/kernel/process_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/process.c rename to trunk/arch/x86_64/kernel/process_64.c