Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / net / tipc / handler.c

diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index f320010f8a656583146acafd93282a160b464838..e1dcf663f8a64960fdfdc824df07f071dca6818e 100644 (file)
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -1,6 +1,6 @@
 /*
  * net/tipc/handler.c: TIPC signal handling
- * 
+ *
  * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
@@ -42,9 +42,9 @@ struct queue_item {
        unsigned long data;
 };
 
-static kmem_cache_t *tipc_queue_item_cache;
+static struct kmem_cache *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,9 +93,9 @@ 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 = 
+       tipc_queue_item_cache =
                kmem_cache_create("tipc_queue_items", sizeof(struct queue_item),
                                  0, SLAB_HWCACHE_ALIGN, NULL, NULL);
        if (!tipc_queue_item_cache)
@@ -107,10 +107,10 @@ int handler_start(void)
        return 0;
 }
 
-void handler_stop(void)
+void tipc_handler_stop(void)
 {
        struct list_head *l, *n;
-       struct queue_item *item; 
+       struct queue_item *item;
 
        if (!handler_enabled)
                return;