Commit 3a4f8a0b authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

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: default avatarHugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e02dc017

arch/microblaze/pci/pci-common.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/powerpc/kernel/pci-common.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

include/linux/mm.h

+0 −10
Original line number Diff line number Diff line
@@ -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 *);

include/linux/shmem_fs.h

+7 −0
Original line number Diff line number Diff line
@@ -57,7 +57,14 @@ extern int shmem_zero_setup(struct vm_area_struct *); 
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);

mm/madvise.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

CRA Git | Maintained and supported by SUSTech CRA and CCSE