summaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-25 10:21:12 -0700
committerDavid S. Miller <davem@davemloft.net>2014-05-03 22:32:37 -0700
commit04df419de34104d8818b8c5cffaa062fa36d20ea (patch)
tree35f20c565e3d6797ed9638e688e4e911251da011 /arch/sparc/mm
parent51e5ef1bb7ab0e5fa7de4e802da5ab22fe35f0bf (diff)
downloadtalos-obmc-linux-04df419de34104d8818b8c5cffaa062fa36d20ea.tar.gz
talos-obmc-linux-04df419de34104d8818b8c5cffaa062fa36d20ea.zip
sparc64: Fix bugs in get_user_pages_fast() wrt. THP.
The large PMD path needs to check _PAGE_VALID not _PAGE_PRESENT, to decide if it needs to bail and return 0. pmd_large() should therefore just check _PAGE_PMD_HUGE. Calls to gup_huge_pmd() are guarded with a check of pmd_large(), so we just need to add a valid bit check. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r--arch/sparc/mm/gup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/gup.c b/arch/sparc/mm/gup.c
index c4d3da68b800..1aed0432c64b 100644
--- a/arch/sparc/mm/gup.c
+++ b/arch/sparc/mm/gup.c
@@ -73,7 +73,7 @@ static int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
struct page *head, *page, *tail;
int refs;
- if (!pmd_large(pmd))
+ if (!(pmd_val(pmd) & _PAGE_VALID))
return 0;
if (write && !pmd_write(pmd))
OpenPOWER on IntegriCloud