diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:31:09 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:34:40 -0400 |
commit | 6aeea3ecc33b1f36dbc3b80461d15a7052ae424f (patch) | |
tree | bbd273e3e0ca76094aed8e9c77e5adfe2b07f779 /net/tipc/handler.c | |
parent | 9844a5524ec532aee826c35e3031637c7fc8287b (diff) | |
parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) |
Merge remote-tracking branch 'origin' into irqdomain/next
Diffstat (limited to 'net/tipc/handler.c')
-rw-r--r-- | net/tipc/handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c index 9c6f22ff1c6d..7a52d3922f3c 100644 --- a/net/tipc/handler.c +++ b/net/tipc/handler.c | |||
@@ -57,14 +57,14 @@ unsigned int tipc_k_signal(Handler routine, unsigned long argument) | |||
57 | struct queue_item *item; | 57 | struct queue_item *item; |
58 | 58 | ||
59 | if (!handler_enabled) { | 59 | if (!handler_enabled) { |
60 | err("Signal request ignored by handler\n"); | 60 | pr_err("Signal request ignored by handler\n"); |
61 | return -ENOPROTOOPT; | 61 | return -ENOPROTOOPT; |
62 | } | 62 | } |
63 | 63 | ||
64 | spin_lock_bh(&qitem_lock); | 64 | spin_lock_bh(&qitem_lock); |
65 | item = kmem_cache_alloc(tipc_queue_item_cache, GFP_ATOMIC); | 65 | item = kmem_cache_alloc(tipc_queue_item_cache, GFP_ATOMIC); |
66 | if (!item) { | 66 | if (!item) { |
67 | err("Signal queue out of memory\n"); | 67 | pr_err("Signal queue out of memory\n"); |
68 | spin_unlock_bh(&qitem_lock); | 68 | spin_unlock_bh(&qitem_lock); |
69 | return -ENOMEM; | 69 | return -ENOMEM; |
70 | } | 70 | } |