sh: include empty zero page in zImage

Commit Message

Magnus Damm Dec. 3, 2009, 12:26 p.m. UTC

None

Patch

--- 0001/arch/sh/boot/compressed/Makefile
+++ work/arch/sh/boot/compressed/Makefile	2009-12-03 21:06:02.000000000 +0900
@@ -48,8 +48,6 @@  $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.al
 $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
 	$(call if_changed,lzma)
 
-OBJCOPYFLAGS += -R .empty_zero_page
-
 LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
 
 $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE
--- 0001/arch/sh/boot/compressed/misc.c
+++ work/arch/sh/boot/compressed/misc.c	2009-12-03 21:05:58.000000000 +0900
@@ -131,7 +131,7 @@  void decompress_kernel(void)
 #ifdef CONFIG_SUPERH64
 	output_addr = (CONFIG_MEMORY_START + 0x2000);
 #else
-	output_addr = __pa((unsigned long)&_text+PAGE_SIZE);
+	output_addr = __pa((unsigned long)&_text);
 #ifdef CONFIG_29BIT
 	output_addr |= P2SEG;
 #endif