aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-01-30 13:32:57 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:32:57 +0100
commit6fdc05d4794056e0b98901646c4b68c60a01d5eb (patch)
treea6cfb308becd6fe47c549084b29c3e9db3a07f68 /arch
parentx86: mask NX from pte_pfn (diff)
downloadlinux-dev-6fdc05d4794056e0b98901646c4b68c60a01d5eb.tar.xz
linux-dev-6fdc05d4794056e0b98901646c4b68c60a01d5eb.zip
x86: unify pgtable accessors which use
Make users of supported_pte_mask common. This has the side-effect of introducing the variable for 32-bit non-PAE, but I think its a pretty small cost to simplify the code. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/init_32.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 29130970c193..04332c09ad1d 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -478,11 +478,12 @@ void zap_low_mappings (void)
int nx_enabled = 0;
+pteval_t __supported_pte_mask __read_mostly = ~_PAGE_NX;
+EXPORT_SYMBOL_GPL(__supported_pte_mask);
+
#ifdef CONFIG_X86_PAE
static int disable_nx __initdata = 0;
-u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
-EXPORT_SYMBOL_GPL(__supported_pte_mask);
/*
* noexec = on|off