summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Carroll <dcarroll@astekcorp.com>2011-06-18 07:36:40 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-30 15:28:05 +1000
commita9c0f41b3a64955fd6f4e9d66ae1df1cbdee0cd0 (patch)
tree9dcc389761a7fe08f06052bc979563158fc268d4
parent2773fcc8c48b947c997ff345f3e453917883cdb5 (diff)
downloadblackbird-op-linux-a9c0f41b3a64955fd6f4e9d66ae1df1cbdee0cd0.tar.gz
blackbird-op-linux-a9c0f41b3a64955fd6f4e9d66ae1df1cbdee0cd0.zip
powerpc: Add printk companion for ppc_md.progress
This patch adds a printk companion to replace the udbg progress function when initmem is freed. Suggested-by: Milton Miller <miltonm@bga.com> Suggested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Dave Carroll <dcarroll@astekcorp.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/include/asm/setup.h2
-rw-r--r--arch/powerpc/kernel/setup-common.c5
-rw-r--r--arch/powerpc/mm/mem.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index dae19342f0b9..c77cb7a7f4dc 100644
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/asm/setup.h
@@ -3,4 +3,6 @@
#include <asm-generic/setup.h>
+extern void ppc_printk_progress(char *s, unsigned short hex);
+
#endif /* _ASM_POWERPC_SETUP_H */
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 79fca2651b65..e053b1641de3 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -704,6 +704,11 @@ static int powerpc_debugfs_init(void)
arch_initcall(powerpc_debugfs_init);
#endif
+void ppc_printk_progress(char *s, unsigned short hex)
+{
+ pr_info("%s\n", s);
+}
+
static int ppc_dflt_bus_notify(struct notifier_block *nb,
unsigned long action, void *data)
{
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index e9379ce6f3be..a3841bb75cbb 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -387,7 +387,7 @@ void free_initmem(void)
{
unsigned long addr;
- ppc_md.progress = NULL;
+ ppc_md.progress = ppc_printk_progress;
addr = (unsigned long)__init_begin;
for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
OpenPOWER on IntegriCloud