From: Hugh Dickins <hughd@xxxxxxxxxx> Subject: mm: remove shmem_mapping() shmem_zero_setup() duplicates Remove the prototypes for shmem_mapping() and shmem_zero_setup() from linux/mm.h, since they are already provided in linux/shmem_fs.h. But shmem_fs.h must then provide the inline stub for shmem_mapping() when CONFIG_SHMEM is not set, and a few more cfiles now need to #include it. Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1702081658250.1549@eggly.anvils Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Michal Simek <monstr@xxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/microblaze/pci/pci-common.c | 1 + arch/powerpc/kernel/pci-common.c | 1 + include/linux/mm.h | 10 ---------- include/linux/shmem_fs.h | 7 +++++++ mm/madvise.c | 1 + mm/memcontrol.c | 1 + mm/mincore.c | 1 + mm/truncate.c | 1 + mm/workingset.c | 1 + 9 files changed, 14 insertions(+), 10 deletions(-) diff -puN arch/microblaze/pci/pci-common.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates arch/microblaze/pci/pci-common.c --- a/arch/microblaze/pci/pci-common.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/arch/microblaze/pci/pci-common.c @@ -22,6 +22,7 @@ #include <linux/init.h> #include <linux/bootmem.h> #include <linux/mm.h> +#include <linux/shmem_fs.h> #include <linux/list.h> #include <linux/syscalls.h> #include <linux/irq.h> diff -puN arch/powerpc/kernel/pci-common.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates arch/powerpc/kernel/pci-common.c --- a/arch/powerpc/kernel/pci-common.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/arch/powerpc/kernel/pci-common.c @@ -25,6 +25,7 @@ #include <linux/of_address.h> #include <linux/of_pci.h> #include <linux/mm.h> +#include <linux/shmem_fs.h> #include <linux/list.h> #include <linux/syscalls.h> #include <linux/irq.h> diff -puN include/linux/mm.h~mm-remove-shmem_mapping-shmem_zero_setup-duplicates include/linux/mm.h --- a/include/linux/mm.h~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/include/linux/mm.h @@ -1168,16 +1168,6 @@ extern void pagefault_out_of_memory(void extern void show_free_areas(unsigned int flags, nodemask_t *nodemask); -int shmem_zero_setup(struct vm_area_struct *); -#ifdef CONFIG_SHMEM -bool shmem_mapping(struct address_space *mapping); -#else -static inline bool shmem_mapping(struct address_space *mapping) -{ - return false; -} -#endif - extern bool can_do_mlock(void); extern int user_shm_lock(size_t, struct user_struct *); extern void user_shm_unlock(size_t, struct user_struct *); diff -puN include/linux/shmem_fs.h~mm-remove-shmem_mapping-shmem_zero_setup-duplicates include/linux/shmem_fs.h --- a/include/linux/shmem_fs.h~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/include/linux/shmem_fs.h @@ -57,7 +57,14 @@ extern int shmem_zero_setup(struct vm_ar extern unsigned long shmem_get_unmapped_area(struct file *, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); extern int shmem_lock(struct file *file, int lock, struct user_struct *user); +#ifdef CONFIG_SHMEM extern bool shmem_mapping(struct address_space *mapping); +#else +static inline bool shmem_mapping(struct address_space *mapping) +{ + return false; +} +#endif /* CONFIG_SHMEM */ extern void shmem_unlock_mapping(struct address_space *mapping); extern struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, pgoff_t index, gfp_t gfp_mask); diff -puN mm/madvise.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates mm/madvise.c --- a/mm/madvise.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/mm/madvise.c @@ -21,6 +21,7 @@ #include <linux/backing-dev.h> #include <linux/swap.h> #include <linux/swapops.h> +#include <linux/shmem_fs.h> #include <linux/mmu_notifier.h> #include <asm/tlb.h> diff -puN mm/memcontrol.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates mm/memcontrol.c --- a/mm/memcontrol.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/mm/memcontrol.c @@ -35,6 +35,7 @@ #include <linux/memcontrol.h> #include <linux/cgroup.h> #include <linux/mm.h> +#include <linux/shmem_fs.h> #include <linux/hugetlb.h> #include <linux/pagemap.h> #include <linux/smp.h> diff -puN mm/mincore.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates mm/mincore.c --- a/mm/mincore.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/mm/mincore.c @@ -14,6 +14,7 @@ #include <linux/syscalls.h> #include <linux/swap.h> #include <linux/swapops.h> +#include <linux/shmem_fs.h> #include <linux/hugetlb.h> #include <linux/uaccess.h> diff -puN mm/truncate.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates mm/truncate.c --- a/mm/truncate.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/mm/truncate.c @@ -20,6 +20,7 @@ #include <linux/task_io_accounting_ops.h> #include <linux/buffer_head.h> /* grr. try_to_release_page, do_invalidatepage */ +#include <linux/shmem_fs.h> #include <linux/cleancache.h> #include <linux/rmap.h> #include "internal.h" diff -puN mm/workingset.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates mm/workingset.c --- a/mm/workingset.c~mm-remove-shmem_mapping-shmem_zero_setup-duplicates +++ a/mm/workingset.c @@ -6,6 +6,7 @@ #include <linux/memcontrol.h> #include <linux/writeback.h> +#include <linux/shmem_fs.h> #include <linux/pagemap.h> #include <linux/atomic.h> #include <linux/module.h> _ -- 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
