sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
f668f55c39
commit
e2dfb912d3
3 changed files with 6 additions and 3 deletions
|
@ -8,6 +8,7 @@
|
|||
.text
|
||||
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
.global startup
|
||||
startup:
|
||||
|
@ -97,7 +98,7 @@ init_stack_addr:
|
|||
decompress_kernel_addr:
|
||||
.long decompress_kernel
|
||||
kernel_start_addr:
|
||||
.long _text+0x1000
|
||||
.long _text+PAGE_SIZE
|
||||
|
||||
.align 9
|
||||
fake_headers_as_bzImage:
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/page.h>
|
||||
#ifdef CONFIG_SH_STANDARD_BIOS
|
||||
#include <asm/sh_bios.h>
|
||||
#endif
|
||||
|
@ -229,7 +230,7 @@ long* stack_start = &user_stack[STACK_SIZE];
|
|||
void decompress_kernel(void)
|
||||
{
|
||||
output_data = 0;
|
||||
output_ptr = P2SEGADDR((unsigned long)&_text+0x1000);
|
||||
output_ptr = P2SEGADDR((unsigned long)&_text+PAGE_SIZE);
|
||||
free_mem_ptr = (unsigned long)&_end;
|
||||
free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
|
||||
|
||||
|
|
|
@ -33,7 +33,8 @@ ENTRY(empty_zero_page)
|
|||
.long 0x00360000 /* INITRD_START */
|
||||
.long 0x000a0000 /* INITRD_SIZE */
|
||||
.long 0
|
||||
.balign PAGE_SIZE,0,PAGE_SIZE
|
||||
1:
|
||||
.skip PAGE_SIZE - empty_zero_page - 1b
|
||||
|
||||
.text
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue