diff options
author | Dave Young <hidave.darkstar@gmail.com> | 2010-02-25 20:28:57 -0500 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2010-07-28 09:59:01 -0400 |
commit | d14f1729483fad3a8817fbbcbd017678b7d1ad26 (patch) | |
tree | ebb47471a0fff9e0bce46043d147f445584acfb0 | |
parent | 6e006701ccc1590500186ef21e074bd900c5dd67 (diff) |
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.h | 5 | ||||
-rw-r--r-- | kernel/sysctl.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/inotify.h b/include/linux/inotify.h index 959a38b8f75..94d209a1b68 100644 --- a/include/linux/inotify.h +++ b/include/linux/inotify.h | |||
@@ -69,4 +69,9 @@ struct inotify_event { | |||
69 | #define IN_CLOEXEC O_CLOEXEC | 69 | #define IN_CLOEXEC O_CLOEXEC |
70 | #define IN_NONBLOCK O_NONBLOCK | 70 | #define IN_NONBLOCK O_NONBLOCK |
71 | 71 | ||
72 | #ifdef __KERNEL__ | ||
73 | #include <linux/sysctl.h> | ||
74 | extern struct ctl_table inotify_table[]; /* for sysctl */ | ||
75 | #endif | ||
76 | |||
72 | #endif /* _LINUX_INOTIFY_H */ | 77 | #endif /* _LINUX_INOTIFY_H */ |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 7b983dbfe0e..fe30db7bdb0 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -131,6 +131,9 @@ static int min_percpu_pagelist_fract = 8; | |||
131 | 131 | ||
132 | static int ngroups_max = NGROUPS_MAX; | 132 | static int ngroups_max = NGROUPS_MAX; |
133 | 133 | ||
134 | #ifdef CONFIG_INOTIFY_USER | ||
135 | #include <linux/inotify.h> | ||
136 | #endif | ||
134 | #ifdef CONFIG_SPARC | 137 | #ifdef CONFIG_SPARC |
135 | #include <asm/system.h> | 138 | #include <asm/system.h> |
136 | #endif | 139 | #endif |
@@ -207,9 +210,6 @@ static struct ctl_table fs_table[]; | |||
207 | static struct ctl_table debug_table[]; | 210 | static struct ctl_table debug_table[]; |
208 | static struct ctl_table dev_table[]; | 211 | static struct ctl_table dev_table[]; |
209 | extern struct ctl_table random_table[]; | 212 | extern struct ctl_table random_table[]; |
210 | #ifdef CONFIG_INOTIFY_USER | ||
211 | extern struct ctl_table inotify_table[]; | ||
212 | #endif | ||
213 | #ifdef CONFIG_EPOLL | 213 | #ifdef CONFIG_EPOLL |
214 | extern struct ctl_table epoll_table[]; | 214 | extern struct ctl_table epoll_table[]; |
215 | #endif | 215 | #endif |