Commit b0aa5e4b authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by John Paul Adrian Glaubitz
Browse files

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 6215d9f4 ("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: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Tested-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Fixes: 6215d9f4 ("arch, mm: consolidate empty_zero_page")
Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarArtur Rojek <contact@artur-rojek.eu>
Signed-off-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
parent 254f4963
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
/*
 * This is set up by the setup-routine at boot-time
 */
extern unsigned char *boot_params_page;
extern unsigned char boot_params_page[];
#define PARAM boot_params_page

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