diff options
| author | akpm <akpm@linux-foundation.org> | 2022-06-27 10:31:44 -0700 |
|---|---|---|
| committer | akpm <akpm@linux-foundation.org> | 2022-06-27 10:31:44 -0700 |
| commit | ee56c3e8eec166f4e4a2ca842b7804d14f3a0208 (patch) | |
| tree | 3bcee4a6090d681b7bbb49d1946c95798f166159 /arch/powerpc/kernel/prom_init.c | |
| parent | 00c9d5632277b21ba8802e26c27254cd9d0dfa13 (diff) | |
| parent | 03c765b0e3b4cb5063276b086c76f7a612856a9a (diff) | |
| download | linux-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.tar.gz linux-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.tar.bz2 linux-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.zip | |
Merge branch 'master' into mm-nonmm-stable
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 04694ec423f6..13d6cb188835 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; |