lkml.org 
[lkml]   [2007]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] i386: minor nx handling adjustment
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;


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-06-12 09:27    [W:0.037 / U:0.376 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site