diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-03-08 11:48:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 11:48:00 +0100 |
| commit | a1a8ba2d4a7cf9884b97b733b45692f9114c5132 (patch) | |
| tree | 3b342c5071c347bdfa0fe6bf9274c30c75ea18d3 /arch/x86/mm/gup.c | |
| parent | x86/mce: Check for faults tagged in EXTABLE_CLASS_FAULT exception table entries (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.tar.xz linux-dev-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.zip | |
Merge branch 'linus' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/gup.c')
| -rw-r--r-- | arch/x86/mm/gup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c index 6d5eb5900372..d8a798d8bf50 100644 --- a/arch/x86/mm/gup.c +++ b/arch/x86/mm/gup.c @@ -102,7 +102,6 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr, return 0; } - page = pte_page(pte); if (pte_devmap(pte)) { pgmap = get_dev_pagemap(pte_pfn(pte), pgmap); if (unlikely(!pgmap)) { @@ -115,6 +114,7 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr, return 0; } VM_BUG_ON(!pfn_valid(pte_pfn(pte))); + page = pte_page(pte); get_page(page); put_dev_pagemap(pgmap); SetPageReferenced(page); |