[EBTABLES]: Clean ebt_register_table() up.

[deliverable/linux.git] / net / tipc / handler.c

diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index cab6f6150460a1772683b420d3931c43f6170c54..ae6ddf00a1aaea8aaaa17d708e4d4eaca4bfe059 100644 (file)
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -1,7 +1,7 @@
 /*
  * net/tipc/handler.c: TIPC signal handling
  * 
- * Copyright (c) 2003-2006, Ericsson AB
+ * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ struct queue_item {
 
 static kmem_cache_t *tipc_queue_item_cache;
 static struct list_head signal_queue_head;
-static spinlock_t qitem_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(qitem_lock);
 static int handler_enabled = 0;
 
 static void process_signal_queue(unsigned long dummy);
@@ -52,7 +52,7 @@ static void process_signal_queue(unsigned long dummy);
 static DECLARE_TASKLET_DISABLED(tipc_tasklet, process_signal_queue, 0);
 
 
-unsigned int k_signal(Handler routine, unsigned long argument)
+unsigned int tipc_k_signal(Handler routine, unsigned long argument)
 {
        struct queue_item *item;
 
@@ -93,7 +93,7 @@ static void process_signal_queue(unsigned long dummy)
        spin_unlock_bh(&qitem_lock);
 }
 
-int handler_start(void)
+int tipc_handler_start(void)
 {
        tipc_queue_item_cache = 
                kmem_cache_create("tipc_queue_items", sizeof(struct queue_item),
@@ -107,7 +107,7 @@ int handler_start(void)
        return 0;
 }
 
-void handler_stop(void)
+void tipc_handler_stop(void)
 {
        struct list_head *l, *n;
        struct queue_item *item;