diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-02-28 23:11:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 17:53:35 -0500 |
commit | 9b83a6a8523a8a96b6353174b193c5c93e16c6c3 (patch) | |
tree | 33bfdc0e1794b3970b7454d746b20c177037765a /include | |
parent | de01bad2f5dec2977143aa242e7eba71d11a4363 (diff) |
[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>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index a0eec16eb0bd..60e0e4a592d2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -660,15 +660,11 @@ static inline int page_mapped(struct page *page) | |||
660 | extern void show_free_areas(void); | 660 | extern void show_free_areas(void); |
661 | 661 | ||
662 | #ifdef CONFIG_SHMEM | 662 | #ifdef CONFIG_SHMEM |
663 | struct page *shmem_nopage(struct vm_area_struct *vma, | ||
664 | unsigned long address, int *type); | ||
665 | int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *new); | 663 | int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *new); |
666 | struct mempolicy *shmem_get_policy(struct vm_area_struct *vma, | 664 | struct mempolicy *shmem_get_policy(struct vm_area_struct *vma, |
667 | unsigned long addr); | 665 | unsigned long addr); |
668 | int shmem_lock(struct file *file, int lock, struct user_struct *user); | 666 | int shmem_lock(struct file *file, int lock, struct user_struct *user); |
669 | #else | 667 | #else |
670 | #define shmem_nopage filemap_nopage | ||
671 | |||
672 | static inline int shmem_lock(struct file *file, int lock, | 668 | static inline int shmem_lock(struct file *file, int lock, |
673 | struct user_struct *user) | 669 | struct user_struct *user) |
674 | { | 670 | { |
@@ -688,7 +684,6 @@ static inline struct mempolicy *shmem_get_policy(struct vm_area_struct *vma, | |||
688 | } | 684 | } |
689 | #endif | 685 | #endif |
690 | struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags); | 686 | struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags); |
691 | extern int shmem_mmap(struct file *file, struct vm_area_struct *vma); | ||
692 | 687 | ||
693 | int shmem_zero_setup(struct vm_area_struct *); | 688 | int shmem_zero_setup(struct vm_area_struct *); |
694 | 689 | ||