summaryrefslogtreecommitdiffstats
path: root/include/linux/genetlink.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-02-20 11:54:53 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-02-20 11:54:53 -0800
commit4c971aa78314253cce914ed29e3d90df3326d646 (patch)
treea9dcf0b1fdc9e1aacff90afb5b3ab79983115dcc /include/linux/genetlink.h
parent4ba24fef3eb3b142197135223b90ced2f319cd53 (diff)
parent290b799c390d77d27effee3ce312203aaa32ee74 (diff)
downloadtalos-op-linux-4c971aa78314253cce914ed29e3d90df3326d646.tar.gz
talos-op-linux-4c971aa78314253cce914ed29e3d90df3326d646.zip
Merge branch 'next' into for-linus
Second round of updates for 3.20.
Diffstat (limited to 'include/linux/genetlink.h')
-rw-r--r--include/linux/genetlink.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 55b685719d52..09460d6d6682 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -11,6 +11,10 @@ extern void genl_unlock(void);
extern int lockdep_genl_is_held(void);
#endif
+/* for synchronisation between af_netlink and genetlink */
+extern atomic_t genl_sk_destructing_cnt;
+extern wait_queue_head_t genl_sk_destructing_waitq;
+
/**
* rcu_dereference_genl - rcu_dereference with debug checking
* @p: The pointer to read, prior to dereferencing
OpenPOWER on IntegriCloud