aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:06 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:06 +0200
commit16cfc182fd3749644a35a134316766dcef5f0d24 (patch)
treed48cd64ebdec9c19e05a00a6fe71046e23d6284e
parente5e96ef2899fb9d6009a53f83952e00cad2a97ab (diff)
downloadkernel_samsung_smdk4412-16cfc182fd3749644a35a134316766dcef5f0d24.zip
kernel_samsung_smdk4412-16cfc182fd3749644a35a134316766dcef5f0d24.tar.gz
kernel_samsung_smdk4412-16cfc182fd3749644a35a134316766dcef5f0d24.tar.bz2
x86_64: prepare shared boot/compressed/head.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86_64/boot/compressed/Makefile4
-rw-r--r--arch/x86_64/boot/compressed/head_64.S (renamed from arch/x86_64/boot/compressed/head.S)0
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile
index 6fb9495..5bfd108 100644
--- a/arch/x86_64/boot/compressed/Makefile
+++ b/arch/x86_64/boot/compressed/Makefile
@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#
-targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc_64.o piggy.o
+targets := vmlinux vmlinux.bin vmlinux.bin.gz head_64.o misc_64.o piggy.o
CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2 \
-fno-strict-aliasing -fPIC -mcmodel=small \
@@ -14,7 +14,7 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
LDFLAGS := -m elf_x86_64
LDFLAGS_vmlinux := -T
-$(obj)/vmlinux: $(src)/vmlinux_64.lds $(obj)/head.o $(obj)/misc_64.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o $(obj)/piggy.o FORCE
$(call if_changed,ld)
@:
diff --git a/arch/x86_64/boot/compressed/head.S b/arch/x86_64/boot/compressed/head_64.S
index 4946764..4946764 100644
--- a/arch/x86_64/boot/compressed/head.S
+++ b/arch/x86_64/boot/compressed/head_64.S