From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 8 Dec 2011 04:41:44 +0000 (+1100)
Subject: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix
X-Git-Tag: next-20111209~3^2~157
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d01087e2451d2eaa5934c2a25f2b2ce2c0d1e69;p=karo-tx-linux.git

mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix

use &=

Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index d4651e1c2147..6161f7cae0da 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2640,7 +2640,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	static DEFINE_MUTEX(hugetlb_instantiation_mutex);
 	struct hstate *h = hstate_vma(vma);
 
-	address = address & huge_page_mask(h);
+	address &= huge_page_mask(h);
 
 	ptep = huge_pte_offset(mm, address);
 	if (ptep) {