linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: shaggy@linux.vnet.ibm.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jon Tollefson <kniht@linux.vnet.ibm.com>,
	Linuxppc-dev@ozlabs.org, linux-mm@kvack.org,
	Paul Mackerras <paulus@au1.ibm.com>
Subject: [patch 2/6] powerpc: hash_huge_page() should get the WIMG bits from the lpte
Date: Wed, 18 Jun 2008 17:32:56 -0500	[thread overview]
Message-ID: <20080618223329.009886485@linux.vnet.ibm.com> (raw)
In-Reply-To: 20080618223254.966080905@linux.vnet.ibm.com

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>
---

 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,

-- 

  parent reply	other threads:[~2008-06-18 22:32 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-18 22:32 [patch 0/6] Strong Access Ordering page attributes for POWER7 shaggy
2008-06-18 22:32 ` [patch 1/6] mm: Allow architectures to define additional protection bits shaggy
2008-07-01  8:53   ` Andrew Morton
2008-07-01 13:54     ` Dave Kleikamp
2008-07-07  5:52       ` Benjamin Herrenschmidt
2008-07-07 21:11         ` Hugh Dickins
2008-07-07 22:24           ` Benjamin Herrenschmidt
2008-07-08  6:18             ` Benjamin Herrenschmidt
2008-07-08 13:00               ` Hugh Dickins
2008-07-08 13:35               ` Dave Kleikamp
2008-06-18 22:32 ` shaggy [this message]
2008-06-18 22:32 ` [patch 3/6] powerpc: Define flags for Strong Access Ordering shaggy
2008-06-18 22:32 ` [patch 4/6] powerpc: Add SAO Feature bit to the cputable shaggy
2008-06-18 22:32 ` [patch 5/6] powerpc: Add Strong Access Ordering shaggy
2008-06-18 22:33 ` [patch 6/6] powerpc: Dont clear _PAGE_COHERENT when _PAGE_SAO is set shaggy
2008-07-03 23:39 ` [patch 0/6] Strong Access Ordering page attributes for POWER7 Benjamin Herrenschmidt
2008-07-07 14:05   ` Dave Kleikamp
2008-07-07 21:23     ` Joel Schopp
2008-07-07 22:27       ` Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080618223329.009886485@linux.vnet.ibm.com \
    --to=shaggy@linux.vnet.ibm.com \
    --cc=Linuxppc-dev@ozlabs.org \
    --cc=akpm@linux-foundation.org \
    --cc=kniht@linux.vnet.ibm.com \
    --cc=linux-mm@kvack.org \
    --cc=paulus@au1.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).