diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-07-09 11:29:34 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-07-09 11:29:34 +0200 |
| commit | 7e74dabc3daf0c217cb5e8e849a8f6c02927950f (patch) | |
| tree | 8620e5d95e732952473eeb764aee17693e4458bd /arch/powerpc/kernel/prom_init.c | |
| parent | powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers (diff) | |
| parent | powerpc/powernv: delay rng platform device creation until later in boot (diff) | |
| download | linux-7e74dabc3daf0c217cb5e8e849a8f6c02927950f.tar.xz linux-7e74dabc3daf0c217cb5e8e849a8f6c02927950f.zip | |
Merge branch 'fixes' into next
Merge our fixes branch. In particular this brings in commit
986481618023 ("powerpc/book3e: Fix PUD allocation size in
map_kernel_page()") which fixes a build failure in next, because commit
2db2008e6363 ("powerpc/64e: Rewrite p4d_populate() as a static inline
function") depends on it.
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 1939683e35ed..a6669c40c1db 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2302,7 +2302,7 @@ static void __init prom_init_stdout(void) static int __init prom_find_machine_type(void) { - char compat[256]; + static char compat[256] __prombss; int len, i = 0; #ifdef CONFIG_PPC64 phandle rtas; |