Merge tag 'v3.10.51' into linux-3.10.x-grsecurity-2.9.1

[people/arne_f/kernel.git] / mm / hugetlb.c

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index b48df044dbdc2cde9e1525a29ea83240295ec97b..f31e19d41f6b81691a6e56e6b5aec415080fa773 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2404,6 +2404,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
                } else {
                        if (cow)
                                huge_ptep_set_wrprotect(src, addr, src_pte);
+                       entry = huge_ptep_get(src_pte);
                        ptepage = pte_page(entry);
                        get_page(ptepage);
                        page_dup_rmap(ptepage);