Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87e9ab13 authored by Dave Kleikamp's avatar Dave Kleikamp Committed by Paul Mackerras
Browse files

powerpc: hash_huge_page() should get the WIMG bits from the lpte 



Signed-off-by: default avatarDave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: Jon Tollefson <kniht@linux.vnet.ibm.com>
Cc: Adam Litke <agl@us.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0cb99013

arch/powerpc/mm/hugetlbpage.c

+2 −3
Original line number Diff line number Diff line
@@ -504,9 +504,8 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access, 
		new_pte = (new_pte & ~_PAGE_HPTEFLAGS) | _PAGE_HASHPTE;

#endif

		/* Add in WIMG bits */

		/* XXX We should store these in the pte */

		/* --BenH: I think they are ... */

		rflags |= _PAGE_COHERENT;

		rflags |= (new_pte & (_PAGE_WRITETHRU | _PAGE_NO_CACHE |

				      _PAGE_COHERENT | _PAGE_GUARDED));



		/* Insert into the hash table, primary slot */

		slot = ppc_md.hpte_insert(hpte_group, va, pa, rflags, 0,