diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-03 08:58:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-03 08:58:42 -0700 |
| commit | f377d0025eb00c0590466f5be9f50decf9b9180e (patch) | |
| tree | 31365f471b763248bdd6de2966a54588ea77ccbc /arch | |
| parent | 811129272de4f91da34f869ae1a1dd1fe608f64f (diff) | |
| parent | b0aa5e4b087b686575f1b31ce54048b4d059b7b8 (diff) | |
| download | linux-next-f377d0025eb00c0590466f5be9f50decf9b9180e.tar.gz linux-next-f377d0025eb00c0590466f5be9f50decf9b9180e.zip | |
Merge tag 'sh-for-v7.1-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh fix from John Paul Adrian Glaubitz:
"The ZERO_PAGE consolidation in v7.1, introduced a regression on sh
which made these systems unbootable.
The problem was that on sh, the initial boot parameters were
previously referenced as an array and after 6215d9f4470f ("arch, mm:
consolidate empty_zero_page"), they were referenced as a pointer which
caused wrong code generation and boot hang.
This changes the declaration back to being an array which fixes the
boot hang"
* tag 'sh-for-v7.1-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: Fix fallout from ZERO_PAGE consolidation
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/include/asm/setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h index 63c9efc06348..8488f76b48b4 100644 --- a/arch/sh/include/asm/setup.h +++ b/arch/sh/include/asm/setup.h @@ -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)) |