diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:23:54 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:23:54 -0500 |
commit | 27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f (patch) | |
tree | 8107ee11c3fe7d3b4be36054af4475326af86d53 /net/tipc/handler.c | |
parent | ad12583f46bcb6ce93ccd99fa063c0d701146b2e (diff) | |
parent | 4323add67792ced172d0d93b8b2e6187023115f1 (diff) |
Merge git://tipc.cslab.ericsson.net/pub/git/tipc
Diffstat (limited to 'net/tipc/handler.c')
-rw-r--r-- | net/tipc/handler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c index f320010f8a65..966f70a1b608 100644 --- a/net/tipc/handler.c +++ b/net/tipc/handler.c | |||
@@ -52,7 +52,7 @@ static void process_signal_queue(unsigned long dummy); | |||
52 | static DECLARE_TASKLET_DISABLED(tipc_tasklet, process_signal_queue, 0); | 52 | static DECLARE_TASKLET_DISABLED(tipc_tasklet, process_signal_queue, 0); |
53 | 53 | ||
54 | 54 | ||
55 | unsigned int k_signal(Handler routine, unsigned long argument) | 55 | unsigned int tipc_k_signal(Handler routine, unsigned long argument) |
56 | { | 56 | { |
57 | struct queue_item *item; | 57 | struct queue_item *item; |
58 | 58 | ||
@@ -93,7 +93,7 @@ static void process_signal_queue(unsigned long dummy) | |||
93 | spin_unlock_bh(&qitem_lock); | 93 | spin_unlock_bh(&qitem_lock); |
94 | } | 94 | } |
95 | 95 | ||
96 | int handler_start(void) | 96 | int tipc_handler_start(void) |
97 | { | 97 | { |
98 | tipc_queue_item_cache = | 98 | tipc_queue_item_cache = |
99 | kmem_cache_create("tipc_queue_items", sizeof(struct queue_item), | 99 | kmem_cache_create("tipc_queue_items", sizeof(struct queue_item), |
@@ -107,7 +107,7 @@ int handler_start(void) | |||
107 | return 0; | 107 | return 0; |
108 | } | 108 | } |
109 | 109 | ||
110 | void handler_stop(void) | 110 | void tipc_handler_stop(void) |
111 | { | 111 | { |
112 | struct list_head *l, *n; | 112 | struct list_head *l, *n; |
113 | struct queue_item *item; | 113 | struct queue_item *item; |