From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>, Andi Kleen <ak@suse.de>,
Glauber de Oliveira Costa <glommer@gmail.com>,
Jan Beulich <jbeulich@novell.com>
Subject: [PATCH 4 of 4] x86: mask NX from pte_pfn
Date: Tue, 15 Jan 2008 14:17:09 -0800 [thread overview]
Message-ID: <b27ec2092a01dc15e139.1200435429@localhost> (raw)
In-Reply-To: <patchbomb.1200435425@localhost>
In 32-bit PAE, mask NX from pte_pfn, since it isn't part of the PFN.
This code is due for unification anyway, but this fixes a latent bug.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
---
include/asm-x86/pgtable-3level.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
@@ -139,7 +139,7 @@ static inline int pte_none(pte_t pte)
static inline unsigned long pte_pfn(pte_t pte)
{
- return pte_val(pte) >> PAGE_SHIFT;
+ return (pte_val(pte) >> PAGE_SHIFT) & ~_PAGE_NX;
}
/*
next prev parent reply other threads:[~2008-01-15 22:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-15 22:17 [PATCH 0 of 4] x86: some more patches Jeremy Fitzhardinge
2008-01-15 22:17 ` [PATCH 1 of 4] x86: refactor mmu ops in paravirt.h Jeremy Fitzhardinge
2008-01-15 22:17 ` [PATCH 2 of 4] x86: fix warning Jeremy Fitzhardinge
2008-01-15 22:17 ` [PATCH 3 of 4] x86: clean up pte_modify Jeremy Fitzhardinge
2008-01-16 0:43 ` Andi Kleen
2008-01-15 22:17 ` Jeremy Fitzhardinge [this message]
2008-01-18 13:52 ` [PATCH 4 of 4] x86: mask NX from pte_pfn Hugh Dickins
2008-01-18 14:01 ` Ingo Molnar
2008-01-18 15:55 ` Jeremy Fitzhardinge
2008-01-15 22:35 ` [PATCH 0 of 4] x86: some more patches Ingo Molnar
2008-01-15 23:28 ` Jeremy Fitzhardinge
2008-01-16 0:44 ` Andi Kleen
2008-01-16 7:25 ` Ingo Molnar
2008-01-16 14:22 ` Ingo Molnar
2008-01-16 14:44 ` Andi Kleen
2008-01-16 14:54 ` Ingo Molnar
2008-01-16 15:18 ` Ingo Molnar
2008-01-16 15:26 ` Andi Kleen
2008-01-16 15:42 ` Jan Beulich
2008-01-16 15:47 ` Ingo Molnar
2008-01-16 16:06 ` Ingo Molnar
2008-01-16 17:05 ` Jeremy Fitzhardinge
2008-01-16 17:12 ` Andi Kleen
2008-01-16 17:40 ` Andi Kleen
2008-01-16 20:22 ` Ingo Molnar
2008-01-16 20:59 ` Andi Kleen
2008-01-16 21:06 ` Ingo Molnar
2008-01-16 21:35 ` Andi Kleen
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=b27ec2092a01dc15e139.1200435429@localhost \
--to=jeremy@goop.org \
--cc=ak@suse.de \
--cc=glommer@gmail.com \
--cc=jbeulich@novell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.