From: "Jan Beulich" <jbeulich@novell.com>
To: "Andi Kleen" <ak@suse.de>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] i386: minor nx handling adjustment
Date: Tue, 12 Jun 2007 09:24:46 +0200 [thread overview]
Message-ID: <466E665E.76E4.0078.0@novell.com> (raw)
Constrain __supported_pte_mask and NX handling to just the PAE kernel.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
arch/i386/mm/init.c | 7 ++++---
include/asm-i386/page.h | 1 -
2 files changed, 4 insertions(+), 4 deletions(-)
--- linux-2.6.22-rc4/arch/i386/mm/init.c 2007-06-11 18:09:52.000000000 +0200
+++ 2.6.22-rc4-i386-supported_pte_mask/arch/i386/mm/init.c 2007-06-01 17:45:18.000000000 +0200
@@ -471,6 +471,10 @@ void zap_low_mappings (void)
flush_tlb_all();
}
+int nx_enabled = 0;
+
+#ifdef CONFIG_X86_PAE
+
static int disable_nx __initdata = 0;
u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
@@ -499,9 +503,6 @@ static int __init noexec_setup(char *str
}
early_param("noexec", noexec_setup);
-int nx_enabled = 0;
-#ifdef CONFIG_X86_PAE
-
static void __init set_nx(void)
{
unsigned int v[4], l, h;
--- linux-2.6.22-rc4/include/asm-i386/page.h 2007-06-11 18:10:43.000000000 +0200
+++ 2.6.22-rc4-i386-supported_pte_mask/include/asm-i386/page.h 2007-06-01 17:45:18.000000000 +0200
@@ -43,7 +43,6 @@
extern int nx_enabled;
#ifdef CONFIG_X86_PAE
-extern unsigned long long __supported_pte_mask;
typedef struct { unsigned long pte_low, pte_high; } pte_t;
typedef struct { unsigned long long pmd; } pmd_t;
typedef struct { unsigned long long pgd; } pgd_t;
reply other threads:[~2007-06-12 7:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=466E665E.76E4.0078.0@novell.com \
--to=jbeulich@novell.com \
--cc=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®