The patch titled sysctl extern cleanup: inotify has been added to the -mm tree. Its filename is sysctl-extern-cleanup-inotify.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sysctl extern cleanup: inotify From: Dave Young <hidave.darkstar@xxxxxxxxx> 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@xxxxxxxxx> Cc: Eric Paris <eparis@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/inotify.h | 5 +++++ kernel/sysctl.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -puN include/linux/inotify.h~sysctl-extern-cleanup-inotify include/linux/inotify.h --- a/include/linux/inotify.h~sysctl-extern-cleanup-inotify +++ a/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 -puN kernel/sysctl.c~sysctl-extern-cleanup-inotify kernel/sysctl.c --- a/kernel/sysctl.c~sysctl-extern-cleanup-inotify +++ a/kernel/sysctl.c @@ -75,6 +75,9 @@ #ifdef CONFIG_EPOLL #include <linux/poll.h> #endif +#ifdef CONFIG_INOTIFY_USER +#include <linux/inotify.h> +#endif #ifdef CONFIG_CHR_DEV_SG #include <scsi/sg.h> #endif @@ -178,9 +181,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 /* The default sysctl tables: */ _ Patches currently in -mm which might be from hidave.darkstar@xxxxxxxxx are linux-next.patch sysctl-extern-cleanup-c_a_d.patch sysctl-extern-cleanup-signal.patch sysctl-extern-cleanup-binfmts.patch sysctl-extern-cleanup-pid.patch sysctl-extern-cleanup-mm.patch sysctl-extern-cleanup-compat.patch sysctl-extern-cleanup-latencytop.patch sysctl-extern-cleanup-file-nr.patch sysctl-extern-cleanup-rcu.patch sysctl-extern-cleanup-block-iopoll.patch sysctl-extern-cleanup-module.patch sysctl-extern-cleanup-sg.patch sysctl-extern-cleanup-acct.patch sysctl-extern-cleanup-rtmutex.patch sysctl-extern-cleanup-lockdep.patch sysctl-extern-cleanup-poll.patch sysctl-extern-cleanup-inotify.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html