diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-12-11 18:53:29 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-12-11 18:53:29 -0500 |
commit | e2dfb912d3cea97d8b1d6750abbe9c942b6f73f5 (patch) | |
tree | f52d562580fad884e636d5783ad988091f88c1c1 /arch/sh/boot/compressed/misc.c | |
parent | f668f55c3941faacc6f298f434b1af3d5142eed7 (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/misc.c')
-rw-r--r-- | arch/sh/boot/compressed/misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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]; | |||
229 | void decompress_kernel(void) | 230 | void 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 | ||