diff options
| author |   Chris Zankel <chris@zankel.net> | 2014-10-20 21:26:01 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-10-20 21:26:01 -0700 |
| commit | a13926db3e5ea5bbac297f59e9f35061f52892d3 (patch) | |
| tree | b794f25550b7dbbe9cc8eda81633df9023b4821c /mm/pgtable-generic.c | |
| parent | xtensa/uapi: Add definition of TIOC[SG]RS485 (diff) | |
| parent | Linux 3.18-rc1 (diff) | |
| download | wireguard-linux-a13926db3e5ea5bbac297f59e9f35061f52892d3.tar.xz wireguard-linux-a13926db3e5ea5bbac297f59e9f35061f52892d3.zip | |
Merge tag 'v3.18-rc1' into for_next
Linux 3.18-rc1
Diffstat (limited to 'mm/pgtable-generic.c')
| -rw-r--r-- | mm/pgtable-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index a8b919925934..dfb79e028ecb 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -195,7 +195,7 @@ void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, pmd_t entry = *pmdp; if (pmd_numa(entry)) entry = pmd_mknonnuma(entry); - set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(*pmdp)); + set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(entry)); flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE); } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ |