CKRM memory controller is not stable for long-term uptimes. Disabling! :(

[linux-2.6.git] / arch / um / drivers / stdio_console.c

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 7159367..e721e15 100644 (file)
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -17,8 +17,8 @@
 #include "linux/init.h"
 #include "linux/interrupt.h"
 #include "linux/slab.h"
+#include "linux/hardirq.h"
 #include "asm/current.h"
-#include "asm/hardirq.h"
 #include "asm/irq.h"
 #include "stdio_console.h"
 #include "line.h"
@@ -143,10 +143,10 @@ static void con_close(struct tty_struct *tty, struct file *filp)
        line_close(vts, tty);
 }
 
-static int con_write(struct tty_struct *tty, int from_user, 
+static int con_write(struct tty_struct *tty, 
                     const unsigned char *buf, int count)
 {
-        return(line_write(vts, tty, from_user, buf, count));
+        return(line_write(vts, tty, buf, count));
 }
 
 static void set_termios(struct tty_struct *tty, struct termios * old)
@@ -191,7 +191,7 @@ int stdio_init(void)
 
 late_initcall(stdio_init);
 
-static void console_write(struct console *console, const char *string, 
+static void uml_console_write(struct console *console, const char *string,
                          unsigned len)
 {
        struct line *line = &vts[console->index];
@@ -203,22 +203,22 @@ static void console_write(struct console *console, const char *string,
                up(&line->sem);
 }
 
-static struct tty_driver *console_device(struct console *c, int *index)
+static struct tty_driver *uml_console_device(struct console *c, int *index)
 {
        *index = c->index;
        return console_driver;
 }
 
-static int console_setup(struct console *co, char *options)
+static int uml_console_setup(struct console *co, char *options)
 {
        return(0);
 }
 
 static struct console stdiocons = {
        name:           "tty",
-       write:          console_write,
-       device:         console_device,
-       setup:          console_setup,
+       write:          uml_console_write,
+       device:         uml_console_device,
+       setup:          uml_console_setup,
        flags:          CON_PRINTBUFFER,
        index:          -1,
 };