From 3fde0f0b1daf25b3faa39484fc699105bef44578 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 5 Mar 2009 14:39:03 +0100 Subject: [PATCH] --- yaml --- r: 138681 b: refs/heads/master c: 62436fe9ee10f5e0dd087b106d69d93c9549935a h: refs/heads/master i: 138679: f7c50e771dd2f85ce8f44736106d9626fbba6a37 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/pgtable_types.h | 1 + trunk/arch/x86/mm/init_32.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 00efe6f6e50a..749433341d29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fcb208391be5cf82c6fe2779c5eb9245ac97e91 +refs/heads/master: 62436fe9ee10f5e0dd087b106d69d93c9549935a diff --git a/trunk/arch/x86/include/asm/pgtable_types.h b/trunk/arch/x86/include/asm/pgtable_types.h index 4d258ad76a0f..b8238dc8786d 100644 --- a/trunk/arch/x86/include/asm/pgtable_types.h +++ b/trunk/arch/x86/include/asm/pgtable_types.h @@ -273,6 +273,7 @@ typedef struct page *pgtable_t; extern pteval_t __supported_pte_mask; extern int nx_enabled; +extern void set_nx(void); #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c index 1669693e97de..5e5126e0d544 100644 --- a/trunk/arch/x86/mm/init_32.c +++ b/trunk/arch/x86/mm/init_32.c @@ -605,7 +605,7 @@ static int __init noexec_setup(char *str) } early_param("noexec", noexec_setup); -static void __init set_nx(void) +void __init set_nx(void) { unsigned int v[4], l, h;