hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Beulich 2007-07-21 17:10:26 +02:00 committed by Linus Torvalds
parent 09488165d5
commit d5321abe6a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/i386/mm/init.c
View File

@ -471,6 +471,10 @@ void zap_low_mappings (void)
flush_tlb_all(); flush_tlb_all();
} }
int nx_enabled = 0;
#ifdef CONFIG_X86_PAE
static int disable_nx __initdata = 0; static int disable_nx __initdata = 0;
u64 __supported_pte_mask __read_mostly = ~_PAGE_NX; u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
EXPORT_SYMBOL_GPL(__supported_pte_mask); EXPORT_SYMBOL_GPL(__supported_pte_mask);
@ -500,9 +504,6 @@ static int __init noexec_setup(char *str)
} }
early_param("noexec", noexec_setup); early_param("noexec", noexec_setup);
int nx_enabled = 0;
#ifdef CONFIG_X86_PAE
static void __init set_nx(void) static void __init set_nx(void)
{ {
unsigned int v[4], l, h; unsigned int v[4], l, h;

1
include/asm-i386/page.h
View File

@ -44,7 +44,6 @@
extern int nx_enabled; extern int nx_enabled;
#ifdef CONFIG_X86_PAE #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 pte_low, pte_high; } pte_t;
typedef struct { unsigned long long pmd; } pmd_t; typedef struct { unsigned long long pmd; } pmd_t;
typedef struct { unsigned long long pgd; } pgd_t; typedef struct { unsigned long long pgd; } pgd_t;