From 9ba07ef41f404a48d114756a439ae3b2b1b36afd Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Thu, 19 Jun 2008 08:32:56 +1000 Subject: [PATCH] --- yaml --- r: 101707 b: refs/heads/master c: 87e9ab13c36b838f7d557a6111dfdd29fcde85ad h: refs/heads/master i: 101705: f53dadd7c912996c8afbf03a96cf1ff260aba725 101703: 8cc994586d68b0cd3adb18d4accbb997b21fb91e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/hugetlbpage.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4b20d4f490dd..a06de4a67e4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cb99013775f75a7b2cc72a26f48827601cf7cee +refs/heads/master: 87e9ab13c36b838f7d557a6111dfdd29fcde85ad diff --git a/trunk/arch/powerpc/mm/hugetlbpage.c b/trunk/arch/powerpc/mm/hugetlbpage.c index 8fa07f3f6c2b..0d12fba31bc5 100644 --- a/trunk/arch/powerpc/mm/hugetlbpage.c +++ b/trunk/arch/powerpc/mm/hugetlbpage.c @@ -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,