diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-10 11:25:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-10 11:25:55 +0800 |
| commit | 9b27d238e08f69c2e2b684e490750df6e6a1976c (patch) | |
| tree | cf952684009d1eb5bd123e733ac3ea8f440dd1ab /mm | |
| parent | a0d6a47ed69978c84ba8859c3cdbbbd04e79eb2d (diff) | |
| parent | e8f616ae4f32159f77e60f73a4267b5806c418bd (diff) | |
Merge tag 'v3.14.35' into linux-linaro-lsk-v3.14
This is the 3.14.35 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 67d0c175efcf..472259b00618 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3456,6 +3456,8 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address, { struct page *page; + if (!pmd_present(*pmd)) + return NULL; page = pte_page(*(pte_t *)pmd); if (page) page += ((address & ~PMD_MASK) >> PAGE_SHIFT); |