diff options
| author | Linus Torvalds <[email protected]> | 2014-05-23 16:38:07 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-05-23 16:38:07 +0000 |
| commit | fc3ac5c75bae55ca6a070eb72038a94d4f130d8d (patch) | |
| tree | 9ff7417bda4655bafa961bebf600ea6fd0cab8a4 /mm/madvise.c | |
| parent | parisc: 'renameat2()' doesn't need (or have) a separate compat system call (diff) | |
| parent | MAINTAINERS: add closing angle bracket to Vince Bridgers' email address (diff) | |
| download | kernel-fc3ac5c75bae55ca6a070eb72038a94d4f130d8d.tar.gz kernel-fc3ac5c75bae55ca6a070eb72038a94d4f130d8d.zip | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc fixes from Andrew Morton:
"9 fixes"
* emailed patches from Andrew Morton <[email protected]>:
MAINTAINERS: add closing angle bracket to Vince Bridgers' email address
Documentation: fix DOCBOOKS=... building
ocfs2: fix double kmem_cache_destroy in dlm_init
mm/memory-failure.c: fix memory leak by race between poison and unpoison
wait: swap EXIT_ZOMBIE(Z) and EXIT_DEAD(X) chars in TASK_STATE_TO_CHAR_STR
memcg: fix swapcache charge from kernel thread context
mm: madvise: fix MADV_WILLNEED on shmem swapouts
mm/filemap.c: avoid always dirtying mapping->flags on O_DIRECT
hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage
Diffstat (limited to 'mm/madvise.c')
| -rw-r--r-- | mm/madvise.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 539eeb96b323..a402f8fdc68e 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -195,7 +195,7 @@ static void force_shm_swapin_readahead(struct vm_area_struct *vma, for (; start < end; start += PAGE_SIZE) { index = ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; - page = find_get_page(mapping, index); + page = find_get_entry(mapping, index); if (!radix_tree_exceptional_entry(page)) { if (page) page_cache_release(page); |