git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[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
..
491614c
100644
(file)
--- 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 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)
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;
}
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);
}
{
return write (buf, len);
}