aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/udbg.c6
-rw-r--r--arch/powerpc/platforms/powermac/setup.c8
-rw-r--r--include/asm-powerpc/udbg.h1
3 files changed, 8 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 9567d9474c80..558c1ceb2b93 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -90,6 +90,12 @@ void udbg_printf(const char *fmt, ...)
90 va_end(args); 90 va_end(args);
91} 91}
92 92
93void __init udbg_progress(char *s, unsigned short hex)
94{
95 udbg_puts(s);
96 udbg_puts("\n");
97}
98
93/* 99/*
94 * Early boot console based on udbg 100 * Early boot console based on udbg
95 */ 101 */
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 1daa5a06e9ea..e5a5bdbdda7a 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -639,12 +639,6 @@ static void __init pmac_init_early(void)
639#endif 639#endif
640} 640}
641 641
642static void __init pmac_progress(char *s, unsigned short hex)
643{
644 udbg_puts(s);
645 udbg_puts("\n");
646}
647
648/* 642/*
649 * pmac has no legacy IO, anything calling this function has to 643 * pmac has no legacy IO, anything calling this function has to
650 * fail or bad things will happen 644 * fail or bad things will happen
@@ -763,7 +757,7 @@ struct machdep_calls __initdata pmac_md = {
763 .calibrate_decr = pmac_calibrate_decr, 757 .calibrate_decr = pmac_calibrate_decr,
764 .feature_call = pmac_do_feature_call, 758 .feature_call = pmac_do_feature_call,
765 .check_legacy_ioport = pmac_check_legacy_ioport, 759 .check_legacy_ioport = pmac_check_legacy_ioport,
766 .progress = pmac_progress, 760 .progress = udbg_progress,
767#ifdef CONFIG_PPC64 761#ifdef CONFIG_PPC64
768 .pci_probe_mode = pmac_pci_probe_mode, 762 .pci_probe_mode = pmac_pci_probe_mode,
769 .idle_loop = native_idle, 763 .idle_loop = native_idle,
diff --git a/include/asm-powerpc/udbg.h b/include/asm-powerpc/udbg.h
index 6c8abc924b28..479f2d8ff74a 100644
--- a/include/asm-powerpc/udbg.h
+++ b/include/asm-powerpc/udbg.h
@@ -24,6 +24,7 @@ extern int udbg_read(char *buf, int buflen);
24 24
25extern void register_early_udbg_console(void); 25extern void register_early_udbg_console(void);
26extern void udbg_printf(const char *fmt, ...); 26extern void udbg_printf(const char *fmt, ...);
27extern void udbg_progress(char *s, unsigned short hex);
27 28
28extern void udbg_init_uart(void __iomem *comport, unsigned int speed, 29extern void udbg_init_uart(void __iomem *comport, unsigned int speed,
29 unsigned int clock); 30 unsigned int clock);