Merge remote branch 'origin' into secretlab/next-devicetree

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

diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index ae6ddf00a1aaea8aaaa17d708e4d4eaca4bfe059..0c70010a7dfe9671ab9f019940354de1de5c1672 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,7 +42,7 @@ 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 DEFINE_SPINLOCK(qitem_lock);
 static int handler_enabled = 0;
@@ -95,9 +95,9 @@ static void process_signal_queue(unsigned long dummy)
 
 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);
+                                 0, SLAB_HWCACHE_ALIGN, NULL);
        if (!tipc_queue_item_cache)
                return -ENOMEM;
 
@@ -110,7 +110,7 @@ int tipc_handler_start(void)
 void tipc_handler_stop(void)
 {
        struct list_head *l, *n;
-       struct queue_item *item; 
+       struct queue_item *item;
 
        if (!handler_enabled)
                return;