Merge remote-tracking branch 'torvalds/master' into perf/urgent

[linux-2.6-microblaze.git] / kernel / ucount.c

diff --git a/kernel/ucount.c b/kernel/ucount.c
index 11b1596..8d8874f 100644 (file)
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -73,6 +73,10 @@ static struct ctl_table user_table[] = {
 #ifdef CONFIG_INOTIFY_USER
        UCOUNT_ENTRY("max_inotify_instances"),
        UCOUNT_ENTRY("max_inotify_watches"),
+#endif
+#ifdef CONFIG_FANOTIFY
+       UCOUNT_ENTRY("max_fanotify_groups"),
+       UCOUNT_ENTRY("max_fanotify_marks"),
 #endif
        { }
 };