diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2009-03-04 14:02:01 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:11:33 -0400 |
commit | e7943fbbfdb6eef03c003b374de1f802cc14f02a (patch) | |
tree | 7cb30fc4a1caa9f4d43273c4bdd75d147209abeb /arch | |
parent | 7c9583a4db7e3009843aaae0567d299e2837c5ae (diff) |
powerpc: Print linux_banner in prom_init
So at least you can see what kernel you're booting if you die
before the kernel prints it mid-way through start_kernel().
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/prom_init_check.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 7f1b33d5e30d..4d5ebb46b2c4 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -2283,6 +2283,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, | |||
2283 | */ | 2283 | */ |
2284 | prom_init_stdout(); | 2284 | prom_init_stdout(); |
2285 | 2285 | ||
2286 | prom_printf("Preparing to boot %s", PTRRELOC((char *)linux_banner)); | ||
2287 | |||
2286 | /* | 2288 | /* |
2287 | * Get default machine type. At this point, we do not differentiate | 2289 | * Get default machine type. At this point, we do not differentiate |
2288 | * between pSeries SMP and pSeries LPAR | 2290 | * between pSeries SMP and pSeries LPAR |
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index ea3a2ec03ffa..1ac136b128f0 100644 --- a/arch/powerpc/kernel/prom_init_check.sh +++ b/arch/powerpc/kernel/prom_init_check.sh | |||
@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush | |||
20 | _end enter_prom memcpy memset reloc_offset __secondary_hold | 20 | _end enter_prom memcpy memset reloc_offset __secondary_hold |
21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start | 21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start |
22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 | 22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 |
23 | reloc_got2 kernstart_addr memstart_addr" | 23 | reloc_got2 kernstart_addr memstart_addr linux_banner" |
24 | 24 | ||
25 | NM="$1" | 25 | NM="$1" |
26 | OBJ="$2" | 26 | OBJ="$2" |