[patch 2/6] powerpc: hash_huge_page() should get the WIMG bits from the lpte
From: <hidden>
Date: 2008-06-18 22:33:30
Also in:
linux-mm
Signed-off-by: Dave Kleikamp <redacted> Cc: Jon Tollefson <redacted> Cc: Adam Litke <redacted> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/mm/hugetlbpage.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Index: linux-2.6.26-rc5/arch/powerpc/mm/hugetlbpage.c ===================================================================
--- linux-2.6.26-rc5.orig/arch/powerpc/mm/hugetlbpage.c
+++ linux-2.6.26-rc5/arch/powerpc/mm/hugetlbpage.c@@ -502,9 +502,8 @@ repeat: new_pte = (new_pte & ~_PAGE_HPTEFLAGS) | _PAGE_HASHPTE; /* 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,
--