Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b83a6a8 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] mm/{,tiny-}shmem.c cleanups 



shmem_{nopage,mmap} are no longer used in ipc/shm.c

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de01bad2

include/linux/mm.h

+0 −5
Original line number Diff line number Diff line
@@ -660,15 +660,11 @@ static inline int page_mapped(struct page *page) 
extern void show_free_areas(void);



#ifdef CONFIG_SHMEM

struct page *shmem_nopage(struct vm_area_struct *vma,

			unsigned long address, int *type);

int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *new);

struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,

					unsigned long addr);

int shmem_lock(struct file *file, int lock, struct user_struct *user);

#else

#define shmem_nopage filemap_nopage



static inline int shmem_lock(struct file *file, int lock,

			     struct user_struct *user)

{
@@ -688,7 +684,6 @@ static inline struct mempolicy *shmem_get_policy(struct vm_area_struct *vma, 
}

#endif

struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);

extern int shmem_mmap(struct file *file, struct vm_area_struct *vma);



int shmem_zero_setup(struct vm_area_struct *);

mm/shmem.c

+3 −2
Original line number Diff line number Diff line
@@ -1228,7 +1228,8 @@ static int shmem_getpage(struct inode *inode, unsigned long idx, 
	return error;

}



struct page *shmem_nopage(struct vm_area_struct *vma, unsigned long address, int *type)

static struct page *shmem_nopage(struct vm_area_struct *vma,

				 unsigned long address, int *type)

{

	struct inode *inode = vma->vm_file->f_path.dentry->d_inode;

	struct page *page = NULL;
@@ -1335,7 +1336,7 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user) 
	return retval;

}



int shmem_mmap(struct file *file, struct vm_area_struct *vma)

static int shmem_mmap(struct file *file, struct vm_area_struct *vma)

{

	file_accessed(file);

	vma->vm_ops = &shmem_vm_ops;

mm/tiny-shmem.c

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ int shmem_unuse(swp_entry_t entry, struct page *page) 
	return 0;

}



#if 0

int shmem_mmap(struct file *file, struct vm_area_struct *vma)

{

	file_accessed(file);
@@ -135,6 +136,7 @@ int shmem_mmap(struct file *file, struct vm_area_struct *vma) 
	return 0;

#endif

}

#endif  /*  0  */



#ifndef CONFIG_MMU

unsigned long shmem_get_unmapped_area(struct file *file,