The patch titled
shmem: remove unused shmem_get_unmapped_area
has been added to the -mm tree. Its filename is
shmem-remove-unused-shmem_get_unmapped_area.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: shmem: remove unused shmem_get_unmapped_area
From: Matt Mackall <mpm@xxxxxxxxxxx>
Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Acked-by: Hugh Dickins <hugh@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm.h | 8 --------
mm/tiny-shmem.c | 11 -----------
2 files changed, 19 deletions(-)
diff -puN include/linux/mm.h~shmem-remove-unused-shmem_get_unmapped_area include/linux/mm.h
--- a/include/linux/mm.h~shmem-remove-unused-shmem_get_unmapped_area
+++ a/include/linux/mm.h
@@ -722,14 +722,6 @@ struct file *shmem_file_setup(char *name
int shmem_zero_setup(struct vm_area_struct *);
-#ifndef CONFIG_MMU
-extern unsigned long shmem_get_unmapped_area(struct file *file,
- unsigned long addr,
- unsigned long len,
- unsigned long pgoff,
- unsigned long flags);
-#endif
-
extern int can_do_mlock(void);
extern int user_shm_lock(size_t, struct user_struct *);
extern void user_shm_unlock(size_t, struct user_struct *);
diff -puN mm/tiny-shmem.c~shmem-remove-unused-shmem_get_unmapped_area mm/tiny-shmem.c
--- a/mm/tiny-shmem.c~shmem-remove-unused-shmem_get_unmapped_area
+++ a/mm/tiny-shmem.c
@@ -121,14 +121,3 @@ int shmem_unuse(swp_entry_t entry, struc
{
return 0;
}
-
-#ifndef CONFIG_MMU
-unsigned long shmem_get_unmapped_area(struct file *file,
- unsigned long addr,
- unsigned long len,
- unsigned long pgoff,
- unsigned long flags)
-{
- return ramfs_nommu_get_unmapped_area(file, addr, len, pgoff, flags);
-}
-#endif
_
Patches currently in -mm which might be from mpm@xxxxxxxxxxx are
pagemap-fix-32-bit-pagemap-regression.patch
linux-next.patch
shmem-remove-unused-shmem_get_unmapped_area.patch
random-dont-try-to-look-at-entropy_count-outside-the-lock.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
