fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / v850 / kernel / memcons.c

diff --git a/arch/v850/kernel/memcons.c b/arch/v850/kernel/memcons.c
index 9bd818b..92f514f 100644 (file)
--- a/arch/v850/kernel/memcons.c
+++ b/arch/v850/kernel/memcons.c
@@ -25,12 +25,12 @@ extern char memcons_output[], memcons_output_end;
 static unsigned long memcons_offs = 0;
 
 /* Spinlock protecting memcons_offs.  */
-static spinlock_t memcons_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(memcons_lock);
 
 
 static size_t write (const char *buf, size_t len)
 {
-       int flags;
+       unsigned long flags;
        char *point;
 
        spin_lock_irqsave (memcons_lock, flags);
@@ -88,8 +88,7 @@ int memcons_tty_open (struct tty_struct *tty, struct file *filp)
        return 0;
 }
 
-int memcons_tty_write (struct tty_struct *tty, int from_user,
-                      const unsigned char *buf, int len)
+int memcons_tty_write (struct tty_struct *tty, const unsigned char *buf, int len)
 {
        return write (buf, len);
 }
@@ -105,7 +104,7 @@ int memcons_tty_chars_in_buffer (struct tty_struct *tty)
        return 0;
 }
 
-static struct tty_operations ops = {
+static const struct tty_operations ops = {
        .open = memcons_tty_open,
        .write = memcons_tty_write,
        .write_room = memcons_tty_write_room,