summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/line.c
diff options
context:
space:
mode:
authorJeff Dike2006-01-06 09:18:54 +0100
committerLinus Torvalds2006-01-06 17:33:46 +0100
commit9010772cdff36072dd509ec72c1a55fccde8e58e (patch)
treeb87fbf28462462b691b6f2bca382dd6188ef3dc1 /arch/um/drivers/line.c
parent[PATCH] uml: Move mconsole support out of generic code (diff)
downloadkernel-qcow2-linux-9010772cdff36072dd509ec72c1a55fccde8e58e.tar.gz
kernel-qcow2-linux-9010772cdff36072dd509ec72c1a55fccde8e58e.tar.xz
kernel-qcow2-linux-9010772cdff36072dd509ec72c1a55fccde8e58e.zip
[PATCH] uml: Add static initializations and declarations
Some structure fields were being dynamically initialized when they could be initialized at compile-time instead. This also makes some declarations static (in the C sense). Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers/line.c')
-rw-r--r--arch/um/drivers/line.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 9af55ece198d..1c2cc5d48bbb 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -668,19 +668,18 @@ struct tty_driver *line_register_devfs(struct lines *set,
return driver;
}
-static spinlock_t winch_handler_lock;
-LIST_HEAD(winch_handlers);
+static DEFINE_SPINLOCK(winch_handler_lock);
+static LIST_HEAD(winch_handlers);
void lines_init(struct line *lines, int nlines)
{
struct line *line;
int i;
- spin_lock_init(&winch_handler_lock);
for(i = 0; i < nlines; i++){
line = &lines[i];
INIT_LIST_HEAD(&line->chan_list);
- spin_lock_init(&line->lock);
+
if(line->init_str == NULL)
continue;