tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+6
-3
+2
-1
arch/sh/boot/compressed/head.S
+2
-1
arch/sh/boot/compressed/head.S
···
8
8
.text
9
9
10
10
#include <linux/linkage.h>
11
+
#include <asm/page.h>
11
12
12
13
.global startup
13
14
startup:
···
98
97
decompress_kernel_addr:
99
98
.long decompress_kernel
100
99
kernel_start_addr:
101
-
.long _text+0x1000
100
+
.long _text+PAGE_SIZE
102
101
103
102
.align 9
104
103
fake_headers_as_bzImage:
+2
-1
arch/sh/boot/compressed/misc.c
+2
-1
arch/sh/boot/compressed/misc.c
···
13
13
14
14
#include <asm/uaccess.h>
15
15
#include <asm/addrspace.h>
16
+
#include <asm/page.h>
16
17
#ifdef CONFIG_SH_STANDARD_BIOS
17
18
#include <asm/sh_bios.h>
18
19
#endif
···
230
229
void decompress_kernel(void)
231
230
{
232
231
output_data = 0;
233
-
output_ptr = P2SEGADDR((unsigned long)&_text+0x1000);
232
+
output_ptr = P2SEGADDR((unsigned long)&_text+PAGE_SIZE);
234
233
free_mem_ptr = (unsigned long)&_end;
235
234
free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
236
235