1 files changed, 23 insertions, 1 deletions

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 11684d9e6bd2..703cfa33a3ca 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -435,7 +435,7 @@ enum {
         NET_IPV4_ROUTE_MAX_SIZE=5,
         NET_IPV4_ROUTE_GC_MIN_INTERVAL=6,
         NET_IPV4_ROUTE_GC_TIMEOUT=7,
-        NET_IPV4_ROUTE_GC_INTERVAL=8,
+        NET_IPV4_ROUTE_GC_INTERVAL=8, /* obsolete since 2.6.38 */
         NET_IPV4_ROUTE_REDIRECT_LOAD=9,
         NET_IPV4_ROUTE_REDIRECT_NUMBER=10,
         NET_IPV4_ROUTE_REDIRECT_SILENCE=11,
@@ -931,6 +931,7 @@ enum
 #ifdef __KERNEL__
 #include <linux/list.h>
 #include <linux/rcupdate.h>
+#include <linux/wait.h>
 
 /* For the /proc/sys support */
 struct ctl_table;
@@ -1011,6 +1012,26 @@ extern int proc_do_large_bitmap(struct ctl_table *, int,
  * cover common cases.
  */
 
+/* Support for userspace poll() to watch for changes */
+struct ctl_table_poll {
+        atomic_t event;
+        wait_queue_head_t wait;
+};
+
+static inline void *proc_sys_poll_event(struct ctl_table_poll *poll)
+{
+        return (void *)(unsigned long)atomic_read(&poll->event);
+}
+
+void proc_sys_poll_notify(struct ctl_table_poll *poll);
+
+#define __CTL_TABLE_POLL_INITIALIZER(name) {                            \
+        .event = ATOMIC_INIT(0),                                        \
+        .wait = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait) }
+
+#define DEFINE_CTL_TABLE_POLL(name)                                     \
+        struct ctl_table_poll name = __CTL_TABLE_POLL_INITIALIZER(name)
+
 /* A sysctl table is an array of struct ctl_table: */
 struct ctl_table 
 {
@@ -1021,6 +1042,7 @@ struct ctl_table
         struct ctl_table *child;
         struct ctl_table *parent;       /* Automatically set */
         proc_handler *proc_handler;     /* Callback for text formatting */
+        struct ctl_table_poll *poll;
         void *extra1;
         void *extra2;
 };