aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/handler.c
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2014-04-09 17:49:29 -0400
committerChris Zankel <chris@zankel.net>2014-04-09 17:49:29 -0400
commite86c4b67feb2c984314eef71314f26cfe39fef36 (patch)
tree3c5a7e2216cdcd1d06b8729bf94eba6dc74a7959 /net/tipc/handler.c
parentb3fdfc1b4b641d372e35ced98814289bc60bc5d1 (diff)
parent9c602629e34bad88a464e08de08118e80beee0d8 (diff)
Merge tag 'xtensa-for-next-20140406' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Merging from Max' tree. Xtensa fixes for 3.15: - add missing cache manipulation symbol exports to fix build failures; - sort extable at build time; - clean up sysmem code, support memmap boot parameter; - add highmem support for cores with non-aliasing caches; - add DTS for xtfpga on KC705. Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'net/tipc/handler.c')
-rw-r--r--net/tipc/handler.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index e4bc8a296744..1fabf160501f 100644
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -58,7 +58,6 @@ unsigned int tipc_k_signal(Handler routine, unsigned long argument)
58 58
59 spin_lock_bh(&qitem_lock); 59 spin_lock_bh(&qitem_lock);
60 if (!handler_enabled) { 60 if (!handler_enabled) {
61 pr_err("Signal request ignored by handler\n");
62 spin_unlock_bh(&qitem_lock); 61 spin_unlock_bh(&qitem_lock);
63 return -ENOPROTOOPT; 62 return -ENOPROTOOPT;
64 } 63 }