diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /net/tipc | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/handler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c index ae6ddf00a1aa..eb80778d6d9c 100644 --- a/net/tipc/handler.c +++ b/net/tipc/handler.c | |||
| @@ -42,7 +42,7 @@ struct queue_item { | |||
| 42 | unsigned long data; | 42 | unsigned long data; |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | static kmem_cache_t *tipc_queue_item_cache; | 45 | static struct kmem_cache *tipc_queue_item_cache; |
| 46 | static struct list_head signal_queue_head; | 46 | static struct list_head signal_queue_head; |
| 47 | static DEFINE_SPINLOCK(qitem_lock); | 47 | static DEFINE_SPINLOCK(qitem_lock); |
| 48 | static int handler_enabled = 0; | 48 | static int handler_enabled = 0; |