diff options
| author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2008-06-19 08:32:56 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-07-01 11:28:02 +1000 |
| commit | 87e9ab13c36b838f7d557a6111dfdd29fcde85ad (patch) | |
| tree | a5256d771463eebdf1830b2d9587758519040ed2 | |
| parent | 0cb99013775f75a7b2cc72a26f48827601cf7cee (diff) | |
| download | olio-linux-3.10-87e9ab13c36b838f7d557a6111dfdd29fcde85ad.tar.xz olio-linux-3.10-87e9ab13c36b838f7d557a6111dfdd29fcde85ad.zip | |
powerpc: hash_huge_page() should get the WIMG bits from the lpte
Signed-off-by: Dave 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: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 8fa07f3f6c2..0d12fba31bc 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -504,9 +504,8 @@ repeat: 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, |