From 66502c385cd8ee41475fc78806b4e0b379968293 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:17 +0200 Subject: [PATCH] --- yaml --- r: 65499 b: refs/heads/master c: 977d5654cb630d6845b84a984fb5698e839f20f2 h: refs/heads/master i: 65497: afbd90b1732e46dbd9bf14d75fa1f9ac95e8b61f 65495: c1f278eac36d14c8544271d4165284bf9599334c v: v3 --- [refs] | 2 +- trunk/arch/x86_64/Makefile | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{head.S => head_64.S} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/x86_64/kernel/{head.S => head_64.S} (100%) diff --git a/[refs] b/[refs] index 21dc6f6a35da..f69ed72832b3 100644 --- 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 index 97de9cbd3b7f..c556b6661514 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_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 index 2c0e778e8acf..b65abc2a15a4 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_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 b/trunk/arch/x86_64/kernel/head_64.S similarity index 100% rename from trunk/arch/x86_64/kernel/head.S rename to trunk/arch/x86_64/kernel/head_64.S