diff options
-rw-r--r-- | arch/powerpc/include/asm/setup.h | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 5 | ||||
-rw-r--r-- | arch/powerpc/mm/mem.c | 2 |
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 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/setup.h> | 4 | #include <asm-generic/setup.h> |
5 | 5 | ||
6 | extern void ppc_printk_progress(char *s, unsigned short hex); | ||
7 | |||
6 | #endif /* _ASM_POWERPC_SETUP_H */ | 8 | #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) | |||
704 | arch_initcall(powerpc_debugfs_init); | 704 | arch_initcall(powerpc_debugfs_init); |
705 | #endif | 705 | #endif |
706 | 706 | ||
707 | void ppc_printk_progress(char *s, unsigned short hex) | ||
708 | { | ||
709 | pr_info("%s\n", s); | ||
710 | } | ||
711 | |||
707 | static int ppc_dflt_bus_notify(struct notifier_block *nb, | 712 | static int ppc_dflt_bus_notify(struct notifier_block *nb, |
708 | unsigned long action, void *data) | 713 | unsigned long action, void *data) |
709 | { | 714 | { |
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) | |||
387 | { | 387 | { |
388 | unsigned long addr; | 388 | unsigned long addr; |
389 | 389 | ||
390 | ppc_md.progress = NULL; | 390 | ppc_md.progress = ppc_printk_progress; |
391 | 391 | ||
392 | addr = (unsigned long)__init_begin; | 392 | addr = (unsigned long)__init_begin; |
393 | for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) { | 393 | for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) { |