Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 093cb50..908df12 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -297,7 +297,7 @@ static unsigned long change_pte_range(struct mmu_gather *tlb,
  */
 static inline int pmd_none_or_clear_bad_unless_trans_huge(pmd_t *pmd)
 {
-       pmd_t pmdval = pmd_read_atomic(pmd);
+       pmd_t pmdval = pmdp_get_lockless(pmd);
 
        /* See pmd_none_or_trans_huge_or_clear_bad for info on barrier */
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE