diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-10-15 11:20:54 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-15 11:20:54 -0400 |
| commit | df9b42963f2d010ae3163a894ce22cf6b27cd344 (patch) | |
| tree | f42f826d9bb975766c1a79986c39e64c9a900908 /net/tipc/handler.c | |
| parent | 33766368f6532313571534f9112b1796d6651bbe (diff) | |
| parent | c3e7724b6bc2f25e46c38dbe68f09d71fafeafb8 (diff) | |
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'net/tipc/handler.c')
| -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 7a52d3922f3c..111ff8300ae5 100644 --- a/net/tipc/handler.c +++ b/net/tipc/handler.c | |||
| @@ -45,7 +45,7 @@ struct queue_item { | |||
| 45 | static struct kmem_cache *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; | 48 | static int handler_enabled __read_mostly; |
| 49 | 49 | ||
| 50 | static void process_signal_queue(unsigned long dummy); | 50 | static void process_signal_queue(unsigned long dummy); |
| 51 | 51 | ||