From 49f79223dd99d3233be848fe0e12ebdb0fd9c569 Mon Sep 17 00:00:00 2001 From: Guangyu Sun Date: Wed, 14 Nov 2012 19:12:46 -0800 Subject: [PATCH] mm: hugetlbfs: assign return value of huge_pmd_share() to pte Orabug: 15861301 fix merge error in commit 5778cdb5a3b3bab9152ae9d18c44660bad05fee7 Author: Michal Hocko Date: Mon Oct 8 03:36:54 2012 -0700 mm: hugetlbfs: correctly populate shared pmd Signed-off-by: Guangyu Sun --- arch/x86/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c index e01e5aeb92786..93463a042ccff 100644 --- a/arch/x86/mm/hugetlbpage.c +++ b/arch/x86/mm/hugetlbpage.c @@ -155,7 +155,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, } else { BUG_ON(sz != PMD_SIZE); if (!xen_pv_domain() && pud_none(*pud)) - huge_pmd_share(mm, addr, pud); + pte = huge_pmd_share(mm, addr, pud); else pte = (pte_t *)pmd_alloc(mm, pud, addr); } -- 2.50.1