summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:01 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:01 +0200
commit6f80a03f0c7f03142219d5fafe4c7232b34eab9c (patch)
treef88b98940f78d8ab18b4d859577a13fafe90a46f
parent7b06e6c58cf71c4c1a930905e395ea73130aa6e0 (diff)
downloadlinux-3.10-6f80a03f0c7f03142219d5fafe4c7232b34eab9c.tar.gz
linux-3.10-6f80a03f0c7f03142219d5fafe4c7232b34eab9c.tar.bz2
linux-3.10-6f80a03f0c7f03142219d5fafe4c7232b34eab9c.zip
x86_64: prepare shared boot/compressed/misc.c
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/misc_64.c (renamed from arch/x86_64/boot/compressed/misc.c)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 877c0bdbbc6..fe623b77991 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.o piggy.o
+targets := vmlinux vmlinux.bin vmlinux.bin.gz head.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.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc_64.o $(obj)/piggy.o FORCE
$(call if_changed,ld)
@:
diff --git a/arch/x86_64/boot/compressed/misc.c b/arch/x86_64/boot/compressed/misc_64.c
index f932b0e8909..f932b0e8909 100644
--- a/arch/x86_64/boot/compressed/misc.c
+++ b/arch/x86_64/boot/compressed/misc_64.c