[PATCH] mm: remove shmem_mapping() shmem_zero_setup() duplicates

[Hugh Dickins]

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.

Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
---
Diff'ed to apply in mmotm somewhere after
lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask.patch
since that modifies a neighbouring line of include/linux/mm.h;
otherwise, applies just as well to 4.10-rc7.

 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(-)

--- 4.10-rc7-mm1/arch/microblaze/pci/pci-common.c	2016-12-11 11:17:54.000000000 -0800
+++ linux/arch/microblaze/pci/pci-common.c	2017-02-08 16:30:39.924378838 -0800
@@ -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>
--- 4.10-rc7-mm1/arch/powerpc/kernel/pci-common.c	2016-12-11 11:17:54.000000000 -0800
+++ linux/arch/powerpc/kernel/pci-common.c	2017-02-08 16:30:39.928378872 -0800
@@ -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>
--- 4.10-rc7-mm1/include/linux/mm.h	2017-02-08 10:56:22.931334986 -0800
+++ linux/include/linux/mm.h	2017-02-08 16:30:39.928378872 -0800
@@ -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 *);
--- 4.10-rc7-mm1/include/linux/shmem_fs.h	2017-02-08 10:56:22.999338725 -0800
+++ linux/include/linux/shmem_fs.h	2017-02-08 16:30:39.928378872 -0800
@@ -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);
--- 4.10-rc7-mm1/mm/madvise.c	2017-02-08 10:56:23.319356319 -0800
+++ linux/mm/madvise.c	2017-02-08 16:30:39.932378905 -0800
@@ -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>
--- 4.10-rc7-mm1/mm/memcontrol.c	2017-02-08 10:56:23.319356319 -0800
+++ linux/mm/memcontrol.c	2017-02-08 16:30:39.932378905 -0800
@@ -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>
--- 4.10-rc7-mm1/mm/mincore.c	2016-12-25 18:40:50.838453325 -0800
+++ linux/mm/mincore.c	2017-02-08 16:30:39.932378905 -0800
@@ -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>
--- 4.10-rc7-mm1/mm/truncate.c	2017-02-08 10:56:23.359358518 -0800
+++ linux/mm/truncate.c	2017-02-08 16:30:39.932378905 -0800
@@ -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"
--- 4.10-rc7-mm1/mm/workingset.c	2017-02-08 10:56:23.367358958 -0800
+++ linux/mm/workingset.c	2017-02-08 16:30:39.932378905 -0800
@@ -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>