The patch titled fs/proc/: make code static has been added to the -mm tree. Its filename is sysctl-reimplement-the-sysctl-proc-support-fix-3.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ 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 @@ -33,7 +33,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 @@ -128,8 +128,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 v9fs_vfs_mkdir-fix-a-double-free.patch git-acpi.patch ifdef-acpi_future_usage-acpi_os_readable.patch git-alsa.patch cpu_freq_table-shouldnt-be-a-def_tristate.patch git-powerpc.patch drivers-char-drm-drm_mmc-remove-unused-exports.patch git-dvb.patch drivers-media-dvb-frontends-make-4-functions-static.patch cx88-videoc-remove-struct-radionorms.patch if-0-v4l_printk_ioctl_arg.patch git-gfs2-nmw.patch make-gfs2_writepages-static.patch git-ieee1394.patch git-libata-all.patch mips-remove-smp_tune_scheduling.patch mtd_ck804xrom-must-depend-on-pci.patch git-ubi.patch git-netdev-all.patch net-wanrouter-wanmainc-cleanups.patch net-uninline-skb_put-fix.patch git-ocfs2.patch drivers-scsi-small-cleanups.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch drivers-scsi-aic7xxx-make-functions-static.patch drivers-scsi-wd33c93c-cleanups.patch drivers-scsi-qla4xxx-possible-cleanups.patch make-seagate_st0x_detect-static.patch drivers-scsi-aacraid-cleanups.patch git-unionfs.patch usb_rtl8150-must-select-mii.patch git-ipwireless_cs.patch cleanup-x86_64-mm-vmi-timer.patch x86_64-re-add-a-newline-to-restore_context.patch arch-i386-kernel-alternativec-should-include-asm-bugsh.patch lumpy-reclaim-cleanup.patch remove-include-linux-byteorder-pdp_endianh.patch make-drivers-char-mxser_newcmxser_hangup-static.patch drivers-char-vc_screenc-proper-prototypes.patch add-taint_user-and-ability-to-set-taint-flags-from-userspace-fix.patch schedule-obsolete-oss-drivers-for-removal-3rd-round.patch cleanup-linux-byteorder-swabbh.patch cleanup-include-linux-xattrh.patch cleanup-include-linux-reiserfs_xattrh.patch remove-dead-kernel-config-option-aedsp16_mpu401.patch debug-shared-irqs-kconfig-fix.patch gtod-persistent-clock-support.patch i386-use-gtod-persistent-clock-support.patch extend-next_timer_interrupt-to-use-a-reference-jiffie.patch clockevents-i383-drivers.patch make-ext2_get_blocks-static.patch drivers-edac-make-code-static.patch drivers-isdn-pcbit-proper-prototypes.patch drivers-isdn-hisax-proper-prototypes.patch drivers-isdn-sc-proper-prototypes.patch include-linux-nfsd-consth-remove-nfs_super_magic.patch ecryptfs-generalize-metadata-read-write-fs-ecryptfs-make-code-static.patch readahead-events-accounting-make-readahead_debug_level-static.patch reiser4-export-remove_from_page_cache-fix.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch fs-reiser4-possible-cleanups-2.patch fs-reiser4-more-possible-cleanups.patch remove-broken-video-drivers-v4.patch remove-bogus-con_is_present-prototypes.patch proper-prototype-for-tosh_smm.patch remove-the-broken-fb_s3trio-driver.patch slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch slim-debug-output-slm_set_taskperm-remove-horrible-error-handling-code.patch sysctl-reimplement-the-sysctl-proc-support-fix-3.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch make-kernel-time-timer_statscnr_entries-static.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