hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Adrian Bunk 2007-02-28 20:11:03 -08:00 committed by Linus Torvalds
parent de01bad2f5
commit 9b83a6a852
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/mm.h
View File

@ -660,15 +660,11 @@ static inline int page_mapped(struct page *page)
extern void show_free_areas(void); extern void show_free_areas(void);
#ifdef CONFIG_SHMEM #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); int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *new);
struct mempolicy *shmem_get_policy(struct vm_area_struct *vma, struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
unsigned long addr); unsigned long addr);
int shmem_lock(struct file *file, int lock, struct user_struct *user); int shmem_lock(struct file *file, int lock, struct user_struct *user);
#else #else
#define shmem_nopage filemap_nopage
static inline int shmem_lock(struct file *file, int lock, static inline int shmem_lock(struct file *file, int lock,
struct user_struct *user) struct user_struct *user)
{ {
@ -688,7 +684,6 @@ static inline struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
} }
#endif #endif
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags); 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 *); int shmem_zero_setup(struct vm_area_struct *);

5
mm/shmem.c
View File

@ -1228,7 +1228,8 @@ failed:
return error; 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 inode *inode = vma->vm_file->f_path.dentry->d_inode;
struct page *page = NULL; struct page *page = NULL;
@ -1335,7 +1336,7 @@ out_nomem:
return retval; 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); file_accessed(file);
vma->vm_ops = &shmem_vm_ops; vma->vm_ops = &shmem_vm_ops;

2
mm/tiny-shmem.c
View File

@ -126,6 +126,7 @@ int shmem_unuse(swp_entry_t entry, struct page *page)
return 0; return 0;
} }
#if 0
int shmem_mmap(struct file *file, struct vm_area_struct *vma) int shmem_mmap(struct file *file, struct vm_area_struct *vma)
{ {
file_accessed(file); file_accessed(file);
@ -135,6 +136,7 @@ int shmem_mmap(struct file *file, struct vm_area_struct *vma)
return 0; return 0;
#endif #endif
} }
#endif /* 0 */
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
unsigned long shmem_get_unmapped_area(struct file *file, unsigned long shmem_get_unmapped_area(struct file *file,