X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fv850%2Fkernel%2Fmemcons.c;h=491614c435cd5f8de9a2d54a445156f94448a5d6;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=9bd818b0f0755c2a428c93b8390684e7c99180ac;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/arch/v850/kernel/memcons.c b/arch/v850/kernel/memcons.c
index 9bd818b0f..491614c43 100644
--- a/arch/v850/kernel/memcons.c
+++ b/arch/v850/kernel/memcons.c
@@ -25,7 +25,7 @@ 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)
@@ -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);
 }