]> err.no Git - linux-2.6/commitdiff
[PATCH] powerpc: added a udbg_progress
authorKumar Gala <galak@gate.crashing.org>
Tue, 20 Dec 2005 22:37:07 +0000 (16:37 -0600)
committerPaul Mackerras <paulus@samba.org>
Mon, 9 Jan 2006 04:33:50 +0000 (15:33 +1100)
Added a common udbg_progress for use by ppc_md.progress()

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/udbg.c
arch/powerpc/platforms/powermac/setup.c
include/asm-powerpc/udbg.h

index 9567d9474c80911a132be02c1e98720238bb88e4..558c1ceb2b93fb046b96971235af929a00247dc2 100644 (file)
@@ -90,6 +90,12 @@ void udbg_printf(const char *fmt, ...)
        va_end(args);
 }
 
+void __init udbg_progress(char *s, unsigned short hex)
+{
+       udbg_puts(s);
+       udbg_puts("\n");
+}
+
 /*
  * Early boot console based on udbg
  */
index 1daa5a06e9ea479161219962d494b21f9e7ed86a..e5a5bdbdda7a8f54c8de7ea690c4afd9dd9bbf65 100644 (file)
@@ -639,12 +639,6 @@ static void __init pmac_init_early(void)
 #endif
 }
 
-static void __init pmac_progress(char *s, unsigned short hex)
-{
-       udbg_puts(s);
-       udbg_puts("\n");
-}
-
 /*
  * pmac has no legacy IO, anything calling this function has to
  * fail or bad things will happen
@@ -763,7 +757,7 @@ struct machdep_calls __initdata pmac_md = {
        .calibrate_decr         = pmac_calibrate_decr,
        .feature_call           = pmac_do_feature_call,
        .check_legacy_ioport    = pmac_check_legacy_ioport,
-       .progress               = pmac_progress,
+       .progress               = udbg_progress,
 #ifdef CONFIG_PPC64
        .pci_probe_mode         = pmac_pci_probe_mode,
        .idle_loop              = native_idle,
index 6c8abc924b28aeb5b3f098033544b6d3a67dd14c..479f2d8ff74a9d2bcf52b999c4fa9594935c5e85 100644 (file)
@@ -24,6 +24,7 @@ extern int udbg_read(char *buf, int buflen);
 
 extern void register_early_udbg_console(void);
 extern void udbg_printf(const char *fmt, ...);
+extern void udbg_progress(char *s, unsigned short hex);
 
 extern void udbg_init_uart(void __iomem *comport, unsigned int speed,
                           unsigned int clock);