summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-09-22 19:57:32 +0200
committerJens Axboe <axboe@fb.com>2014-09-22 19:57:32 +0200
commit6d11fb454b161a4565c57be6f1c5527235741003 (patch)
treec238ed3df2f654181c2a0746478a33b32214cc60 /arch/sh
parentMerge branch 'for-linus' into for-3.18/core (diff)
parentblk-mq: use blk_mq_start_hw_queues() when running requeue work (diff)
downloadlinux-6d11fb454b161a4565c57be6f1c5527235741003.tar.xz
linux-6d11fb454b161a4565c57be6f1c5527235741003.zip
Merge branch 'for-linus' into for-3.18/core
Moving patches from for-linus to 3.18 instead, pull in this changes that will go to Linus today.
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/mm/gup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/mm/gup.c b/arch/sh/mm/gup.c
index bf8daf9d9c9b..37458f38b220 100644
--- a/arch/sh/mm/gup.c
+++ b/arch/sh/mm/gup.c
@@ -105,6 +105,8 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,
VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
page = pte_page(pte);
get_page(page);
+ __flush_anon_page(page, addr);
+ flush_dcache_page(page);
pages[*nr] = page;
(*nr)++;