From 6c4bf9546401eb0dcf9f3a554f947bf51edbc35e Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 4 Mar 2009 19:02:01 +0000 Subject: [PATCH] --- yaml --- r: 138530 b: refs/heads/master c: e7943fbbfdb6eef03c003b374de1f802cc14f02a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 2 ++ trunk/arch/powerpc/kernel/prom_init_check.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 300166818d9e..5cca2f459320 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c9583a4db7e3009843aaae0567d299e2837c5ae +refs/heads/master: e7943fbbfdb6eef03c003b374de1f802cc14f02a diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index 7f1b33d5e30d..4d5ebb46b2c4 100644 --- a/trunk/arch/powerpc/kernel/prom_init.c +++ b/trunk/arch/powerpc/kernel/prom_init.c @@ -2283,6 +2283,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, */ prom_init_stdout(); + prom_printf("Preparing to boot %s", PTRRELOC((char *)linux_banner)); + /* * Get default machine type. At this point, we do not differentiate * between pSeries SMP and pSeries LPAR diff --git a/trunk/arch/powerpc/kernel/prom_init_check.sh b/trunk/arch/powerpc/kernel/prom_init_check.sh index ea3a2ec03ffa..1ac136b128f0 100644 --- a/trunk/arch/powerpc/kernel/prom_init_check.sh +++ b/trunk/arch/powerpc/kernel/prom_init_check.sh @@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush _end enter_prom memcpy memset reloc_offset __secondary_hold __secondary_hold_acknowledge __secondary_hold_spinloop __start strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 -reloc_got2 kernstart_addr memstart_addr" +reloc_got2 kernstart_addr memstart_addr linux_banner" NM="$1" OBJ="$2"