3 files changed, 35 insertions, 12 deletions

diff --git a/arch/mips/dec/prom/console.c b/arch/mips/dec/prom/console.c
index 65419bf32441..078e1a12421d 100644
--- a/arch/mips/dec/prom/console.c
+++ b/arch/mips/dec/prom/console.c
@@ -3,7 +3,7 @@
  *
  *      DECstation PROM-based early console support.
  *
- *      Copyright (C) 2004  Maciej W. Rozycki
+ *      Copyright (C) 2004, 2007  Maciej W. Rozycki
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -13,15 +13,35 @@
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 #include <asm/dec/prom.h>
 
-void prom_putchar(char c)
+static void __init prom_console_write(struct console *con, const char *s,
+                                      unsigned int c)
 {
-        char s[2];
+        char buf[81];
+        unsigned int chunk = sizeof(buf) - 1;
 
-        s[0] = c;
-        s[1] = '\0';
+        while (c > 0) {
+                if (chunk > c)
+                        chunk = c;
+                memcpy(buf, s, chunk);
+                buf[chunk] = '\0';
+                prom_printf("%s", buf);
+                s += chunk;
+                c -= chunk;
+        }
+}
+
+static struct console promcons __initdata = {
+        .name   = "prom",
+        .write  = prom_console_write,
+        .flags  = CON_BOOT | CON_PRINTBUFFER,
+        .index  = -1,
+};
 
-        prom_printf( s);
+void __init register_prom_console(void)
+{
+        register_console(&promcons);
 }
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c
index a217aafe59f6..808c182fd3fa 100644
--- a/arch/mips/dec/prom/init.c
+++ b/arch/mips/dec/prom/init.c
@@ -86,7 +86,7 @@ void __init which_prom(s32 magic, s32 *prom_vec)
 
 void __init prom_init(void)
 {
-        extern void ATTRIB_NORET dec_machine_halt(void);
+        extern void dec_machine_halt(void);
         static char cpu_msg[] __initdata =
                 "Sorry, this kernel is compiled for a wrong CPU type!\n";
         s32 argc = fw_arg0;
@@ -103,6 +103,9 @@ void __init prom_init(void)
         if (prom_is_rex(magic))
                 rex_clear_cache();
 
+        /* Register the early console.  */
+        register_prom_console();
+
         /* Were we compiled with the right CPU option? */
 #if defined(CONFIG_CPU_R3000)
         if ((current_cpu_data.cputype == CPU_R4000SC) ||
diff --git a/arch/mips/dec/reset.c b/arch/mips/dec/reset.c
index 56397227adb0..c15a879046e5 100644
--- a/arch/mips/dec/reset.c
+++ b/arch/mips/dec/reset.c
@@ -9,26 +9,26 @@
 
 #include <asm/addrspace.h>
 
-typedef void ATTRIB_NORET (* noret_func_t)(void);
+typedef void __noreturn (* noret_func_t)(void);
 
-static inline void ATTRIB_NORET back_to_prom(void)
+static inline void __noreturn back_to_prom(void)
 {
         noret_func_t func = (void *)CKSEG1ADDR(0x1fc00000);
 
         func();
 }
 
-void ATTRIB_NORET dec_machine_restart(char *command)
+void __noreturn dec_machine_restart(char *command)
 {
         back_to_prom();
 }
 
-void ATTRIB_NORET dec_machine_halt(void)
+void __noreturn dec_machine_halt(void)
 {
         back_to_prom();
 }
 
-void ATTRIB_NORET dec_machine_power_off(void)
+void __noreturn dec_machine_power_off(void)
 {
     /* DECstations don't have a software power switch */
         back_to_prom();