From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Hugh Dickins <hugh@veritas.com>, Theodore Tso <tytso@mit.edu>,
Gabriel C <nix.or.die@googlemail.com>,
Keith Packard <keithp@keithp.com>,
"Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>,
Eric Anholt <eric@anholt.net>,
"Siddha, Suresh B" <suresh.b.siddha@intel.com>,
airlied@linux.ie, "Barnes, Jesse" <jesse.barnes@intel.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: [PATCH 4 of 8] x86: use PTE_MASK in 32-bit PAE
Date: Tue, 20 May 2008 08:26:20 +0100 [thread overview]
Message-ID: <d2cfb4dc7c7d28ddde78.1211268380@localhost> (raw)
In-Reply-To: <patchbomb.1211268376@localhost>
Use PTE_MASK in 3-level pagetables (ie, 32-bit PAE).
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
include/asm-x86/pgtable-3level.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/asm-x86/pgtable-3level.h b/include/asm-x86/pgtable-3level.h
--- a/include/asm-x86/pgtable-3level.h
+++ b/include/asm-x86/pgtable-3level.h
@@ -120,9 +120,9 @@
write_cr3(pgd);
}
-#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PAGE_MASK))
+#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PTE_MASK))
-#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
+#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_MASK))
/* Find an entry in the second-level page table.. */
@@ -160,7 +160,7 @@
static inline unsigned long pte_pfn(pte_t pte)
{
- return (pte_val(pte) & ~_PAGE_NX) >> PAGE_SHIFT;
+ return (pte_val(pte) & PTE_MASK) >> PAGE_SHIFT;
}
/*
next prev parent reply other threads:[~2008-05-20 9:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-20 7:26 [PATCH 0 of 8] x86: use PTE_MASK consistently Jeremy Fitzhardinge
2008-05-20 7:26 ` [PATCH 1 of 8] x86: define PTE_MASK in a universally useful way Jeremy Fitzhardinge
2008-05-20 7:26 ` [PATCH 2 of 8] x86: fix warning on 32-bit non-PAE Jeremy Fitzhardinge
2008-05-20 7:26 ` [PATCH 3 of 8] x86: rearrange __(VIRTUAL|PHYSICAL)_MASK Jeremy Fitzhardinge
2008-05-20 7:26 ` Jeremy Fitzhardinge [this message]
2008-05-20 7:26 ` [PATCH 5 of 8] x86: use PTE_MASK in pgtable_32.h Jeremy Fitzhardinge
2008-05-20 7:26 ` [PATCH 6 of 8] x86: clarify use of _PAGE_CHG_MASK Jeremy Fitzhardinge
2008-05-20 7:26 ` [PATCH 7 of 8] x86: use PTE_MASK rather than ad-hoc mask Jeremy Fitzhardinge
2008-05-20 7:26 ` [PATCH 8 of 8] xen: use PTE_MASK in pte_mfn() Jeremy Fitzhardinge
2008-05-20 12:57 ` [PATCH 0 of 8] x86: use PTE_MASK consistently Hugh Dickins
2008-05-20 12:59 ` [PATCH] x86: strengthen 64-bit p?d_bad() Hugh Dickins
2008-05-20 13:47 ` [PATCH 0 of 8] x86: use PTE_MASK consistently Jeremy Fitzhardinge
2008-05-20 18:34 ` Linus Torvalds
2008-05-20 19:51 ` Ingo Molnar
2008-05-20 19:55 ` Ingo Molnar
2008-05-20 20:02 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2008-05-09 11:02 Jeremy Fitzhardinge
2008-05-09 11:02 ` [PATCH 4 of 8] x86: use PTE_MASK in 32-bit PAE Jeremy Fitzhardinge
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=d2cfb4dc7c7d28ddde78.1211268380@localhost \
--to=jeremy@goop.org \
--cc=airlied@linux.ie \
--cc=akpm@linux-foundation.org \
--cc=eric@anholt.net \
--cc=hugh@veritas.com \
--cc=jesse.barnes@intel.com \
--cc=keithp@keithp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=nix.or.die@googlemail.com \
--cc=rjw@sisk.pl \
--cc=suresh.b.siddha@intel.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=venkatesh.pallipadi@intel.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