The patch titled fs/proc/: make code static has been removed from the -mm tree. Its filename was sysctl-reimplement-the-sysctl-proc-support-fix-3.patch This patch was dropped because it was folded into sysctl-reimplement-the-sysctl-proc-support.patch ------------------------------------------------------ Subject: fs/proc/: make code static From: Adrian Bunk <bunk@xxxxxxxxx> proc_match() and struct proc_sys_root can now become static. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/generic.c | 2 +- fs/proc/proc_sysctl.c | 2 +- include/linux/proc_fs.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff -puN fs/proc/generic.c~sysctl-reimplement-the-sysctl-proc-support-fix-3 fs/proc/generic.c --- a/fs/proc/generic.c~sysctl-reimplement-the-sysctl-proc-support-fix-3 +++ a/fs/proc/generic.c @@ -32,7 +32,7 @@ static loff_t proc_file_lseek(struct fil DEFINE_SPINLOCK(proc_subdir_lock); -int proc_match(int len, const char *name, struct proc_dir_entry *de) +static int proc_match(int len, const char *name, struct proc_dir_entry *de) { if (de->namelen != len) return 0; diff -puN fs/proc/proc_sysctl.c~sysctl-reimplement-the-sysctl-proc-support-fix-3 fs/proc/proc_sysctl.c --- a/fs/proc/proc_sysctl.c~sysctl-reimplement-the-sysctl-proc-support-fix-3 +++ a/fs/proc/proc_sysctl.c @@ -466,7 +466,7 @@ static struct dentry_operations proc_sys .d_revalidate = proc_sys_revalidate, }; -struct proc_dir_entry *proc_sys_root; +static struct proc_dir_entry *proc_sys_root; int proc_sys_init(void) { diff -puN include/linux/proc_fs.h~sysctl-reimplement-the-sysctl-proc-support-fix-3 include/linux/proc_fs.h --- a/include/linux/proc_fs.h~sysctl-reimplement-the-sysctl-proc-support-fix-3 +++ a/include/linux/proc_fs.h @@ -130,8 +130,6 @@ extern struct vfsmount *proc_mnt; extern int proc_fill_super(struct super_block *,void *,int); extern struct inode *proc_get_inode(struct super_block *, unsigned int, struct proc_dir_entry *); -extern int proc_match(int, const char *,struct proc_dir_entry *); - /* * These are generic /proc routines that use the internal * "struct proc_dir_entry" tree to traverse the filesystem. _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch sysctl-reimplement-the-sysctl-proc-support.patch sysctl-reimplement-the-sysctl-proc-support-fix-3.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.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