Skip to content

Commit b0aa5e4

Browse files
rpptglaubitz
authored andcommitted
sh: Fix fallout from ZERO_PAGE consolidation
Consolidation of empty_zero_page declarations broke boot on sh. sh stores its initial boot parameters in a page reserved in arch/sh/kernel/head_32.S. Before commit 6215d9f ("arch, mm: consolidate empty_zero_page") this page was referenced in C code as an array and after that commit it is referenced as a pointer. This causes wrong code generation and boot hang. Declare boot_params_page as an array to fix the issue. Reported-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Tested-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Fixes: 6215d9f ("arch, mm: consolidate empty_zero_page") Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Artur Rojek <contact@artur-rojek.eu> Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
1 parent 254f496 commit b0aa5e4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/sh/include/asm/setup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/*
88
* This is set up by the setup-routine at boot-time
99
*/
10-
extern unsigned char *boot_params_page;
10+
extern unsigned char boot_params_page[];
1111
#define PARAM boot_params_page
1212

1313
#define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))

0 commit comments

Comments
 (0)