aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boot/compressed
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-12-11 18:53:29 -0500
committerPaul Mundt <lethal@linux-sh.org>2006-12-11 18:53:29 -0500
commite2dfb912d3cea97d8b1d6750abbe9c942b6f73f5 (patch)
treef52d562580fad884e636d5783ad988091f88c1c1 /arch/sh/boot/compressed
parentf668f55c3941faacc6f298f434b1af3d5142eed7 (diff)
sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boot/compressed')
-rw-r--r--arch/sh/boot/compressed/head.S3
-rw-r--r--arch/sh/boot/compressed/misc.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/sh/boot/compressed/head.S b/arch/sh/boot/compressed/head.S
index 4c26a192277d..a8399b013729 100644
--- a/arch/sh/boot/compressed/head.S
+++ b/arch/sh/boot/compressed/head.S
@@ -8,6 +8,7 @@
8.text 8.text
9 9
10#include <linux/linkage.h> 10#include <linux/linkage.h>
11#include <asm/page.h>
11 12
12 .global startup 13 .global startup
13startup: 14startup:
@@ -97,7 +98,7 @@ init_stack_addr:
97decompress_kernel_addr: 98decompress_kernel_addr:
98 .long decompress_kernel 99 .long decompress_kernel
99kernel_start_addr: 100kernel_start_addr:
100 .long _text+0x1000 101 .long _text+PAGE_SIZE
101 102
102 .align 9 103 .align 9
103fake_headers_as_bzImage: 104fake_headers_as_bzImage:
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c
index 35452d85b7f7..df65e305acf7 100644
--- a/arch/sh/boot/compressed/misc.c
+++ b/arch/sh/boot/compressed/misc.c
@@ -13,6 +13,7 @@
13 13
14#include <asm/uaccess.h> 14#include <asm/uaccess.h>
15#include <asm/addrspace.h> 15#include <asm/addrspace.h>
16#include <asm/page.h>
16#ifdef CONFIG_SH_STANDARD_BIOS 17#ifdef CONFIG_SH_STANDARD_BIOS
17#include <asm/sh_bios.h> 18#include <asm/sh_bios.h>
18#endif 19#endif
@@ -229,7 +230,7 @@ long* stack_start = &user_stack[STACK_SIZE];
229void decompress_kernel(void) 230void decompress_kernel(void)
230{ 231{
231 output_data = 0; 232 output_data = 0;
232 output_ptr = P2SEGADDR((unsigned long)&_text+0x1000); 233 output_ptr = P2SEGADDR((unsigned long)&_text+PAGE_SIZE);
233 free_mem_ptr = (unsigned long)&_end; 234 free_mem_ptr = (unsigned long)&_end;
234 free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; 235 free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
235 236