The patch titled fs/jffs2/: make 2 functions static has been added to the -mm tree. Its filename is fs-jffs2-make-2-functions-static.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fs/jffs2/: make 2 functions static From: Adrian Bunk <bunk@xxxxxxxxx> This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/jffs2/malloc.c | 2 +- fs/jffs2/nodelist.h | 2 -- fs/jffs2/scan.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff -puN fs/jffs2/malloc.c~fs-jffs2-make-2-functions-static fs/jffs2/malloc.c --- a/fs/jffs2/malloc.c~fs-jffs2-make-2-functions-static +++ a/fs/jffs2/malloc.c @@ -190,7 +190,7 @@ void jffs2_free_tmp_dnode_info(struct jf kmem_cache_free(tmp_dnode_info_slab, x); } -struct jffs2_raw_node_ref *jffs2_alloc_refblock(void) +static struct jffs2_raw_node_ref *jffs2_alloc_refblock(void) { struct jffs2_raw_node_ref *ret; diff -puN fs/jffs2/nodelist.h~fs-jffs2-make-2-functions-static fs/jffs2/nodelist.h --- a/fs/jffs2/nodelist.h~fs-jffs2-make-2-functions-static +++ a/fs/jffs2/nodelist.h @@ -427,8 +427,6 @@ char *jffs2_getlink(struct jffs2_sb_info /* scan.c */ int jffs2_scan_medium(struct jffs2_sb_info *c); void jffs2_rotate_lists(struct jffs2_sb_info *c); -int jffs2_fill_scan_buf(struct jffs2_sb_info *c, void *buf, - uint32_t ofs, uint32_t len); struct jffs2_inode_cache *jffs2_scan_make_ino_cache(struct jffs2_sb_info *c, uint32_t ino); int jffs2_scan_classify_jeb(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb); int jffs2_scan_dirty_space(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t size); diff -puN fs/jffs2/scan.c~fs-jffs2-make-2-functions-static fs/jffs2/scan.c --- a/fs/jffs2/scan.c~fs-jffs2-make-2-functions-static +++ a/fs/jffs2/scan.c @@ -274,8 +274,8 @@ int jffs2_scan_medium(struct jffs2_sb_in return ret; } -int jffs2_fill_scan_buf (struct jffs2_sb_info *c, void *buf, - uint32_t ofs, uint32_t len) +static int jffs2_fill_scan_buf(struct jffs2_sb_info *c, void *buf, + uint32_t ofs, uint32_t len) { int ret; size_t retlen; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch fix-sgivwfb-compile.patch git-acpi.patch drivers-acpi-scanc-make-acpi_bus_type-static.patch git-agpgart.patch the-scheduled-unexport-of-insert_resource.patch git-gfs2.patch make-variables-static-after-klibc-merge.patch git-libata-all.patch ni5010-netcard-cleanup-fix.patch git-ocfs2.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-qla2xxx-make-more-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-arcmsr-cleanups.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch acx1xx-wireless-driver.patch arch-i386-mach-visws-setupc-remove-dummy-function-calls.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-implement-clone_newuts-flag-tidy.patch task-watchers-register-semundo-task-watcher-cleanup.patch fs-reiser4-possible-cleanups.patch drivers-ide-legacy-ide-csc-make-2-functions-static.patch drivers-md-raid5c-remove-an-unused-variable.patch srcu-add-srcu-operations-to-rcutorture-tidy-2.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch drivers-dma-iovlockc-make-num_pages_spanned-static.patch drivers-net-irda-mcs7780c-make-struct-mcs_driver-static.patch fs-jffs2-make-2-functions-static.patch kernel-lockdepc-possible-cleanups.patch fs-ecryptfs-possible-cleanups.patch re-add-config_sound_sscape.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