Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 10 insertions, 1 deletions

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 5b5f434ac9a0..ce19a2aa0b21 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -61,7 +61,8 @@ enum
         CTL_DEV=7,              /* Devices */
         CTL_BUS=8,              /* Busses */
         CTL_ABI=9,              /* Binary emulation */
-        CTL_CPU=10              /* CPU stuff (speed scaling, etc) */
+        CTL_CPU=10,             /* CPU stuff (speed scaling, etc) */
+        CTL_INOTIFY=11          /* Inotify */
 };
 
 /* CTL_BUS names: */
@@ -70,6 +71,14 @@ enum
         CTL_BUS_ISA=1           /* ISA */
 };
 
+/* CTL_INOTIFY names: */
+enum
+{
+        INOTIFY_MAX_USER_DEVICES=1,     /* max number of inotify device instances per user */
+        INOTIFY_MAX_USER_WATCHES=2,     /* max number of inotify watches per user */
+        INOTIFY_MAX_QUEUED_EVENTS=3     /* Max number of queued events per inotify device instance */
+};
+
 /* CTL_KERN names: */
 enum
 {