summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Young <hidave.darkstar@gmail.com>2010-02-25 20:28:57 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:59:01 -0400
commitd14f1729483fad3a8817fbbcbd017678b7d1ad26 (patch)
treeebb47471a0fff9e0bce46043d147f445584acfb0
parent6e006701ccc1590500186ef21e074bd900c5dd67 (diff)
downloadop-kernel-dev-d14f1729483fad3a8817fbbcbd017678b7d1ad26.zip
op-kernel-dev-d14f1729483fad3a8817fbbcbd017678b7d1ad26.tar.gz
sysctl extern cleanup: inotify
Extern declarations in sysctl.c should be move to their own head file, and then include them in relavant .c files. Move inotify_table extern declaration to linux/inotify.h Signed-off-by: Dave Young <hidave.darkstar@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--include/linux/inotify.h5
-rw-r--r--kernel/sysctl.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index 959a38b..94d209a 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -69,4 +69,9 @@ struct inotify_event {
#define IN_CLOEXEC O_CLOEXEC
#define IN_NONBLOCK O_NONBLOCK
+#ifdef __KERNEL__
+#include <linux/sysctl.h>
+extern struct ctl_table inotify_table[]; /* for sysctl */
+#endif
+
#endif /* _LINUX_INOTIFY_H */
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 7b983db..fe30db7 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -131,6 +131,9 @@ static int min_percpu_pagelist_fract = 8;
static int ngroups_max = NGROUPS_MAX;
+#ifdef CONFIG_INOTIFY_USER
+#include <linux/inotify.h>
+#endif
#ifdef CONFIG_SPARC
#include <asm/system.h>
#endif
@@ -207,9 +210,6 @@ static struct ctl_table fs_table[];
static struct ctl_table debug_table[];
static struct ctl_table dev_table[];
extern struct ctl_table random_table[];
-#ifdef CONFIG_INOTIFY_USER
-extern struct ctl_table inotify_table[];
-#endif
#ifdef CONFIG_EPOLL
extern struct ctl_table epoll_table[];
#endif
OpenPOWER on IntegriCloud