Messages in this thread Patch in this message |  | | | Date | Thu, 5 Mar 2009 13:42:29 GMT | | From | Ingo Molnar <> | | Subject | [tip:x86/mm] x86: move init_memory_mapping() to common mm/init.c, build fix on 32-bit PAE |
| |
Commit-ID: 62436fe9ee10f5e0dd087b106d69d93c9549935a Gitweb: http://git.kernel.org/tip/62436fe9ee10f5e0dd087b106d69d93c9549935a Author: "Ingo Molnar" <mingo@elte.hu> AuthorDate: Thu, 5 Mar 2009 14:39:03 +0100 Commit: Ingo Molnar <mingo@elte.hu> CommitDate: Thu, 5 Mar 2009 14:39:03 +0100
x86: move init_memory_mapping() to common mm/init.c, build fix on 32-bit PAE
Impact: build fix
Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <1236257708-27269-14-git-send-email-penberg@cs.helsinki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/mm/init_32.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 4d258ad..b8238dc 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/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/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 1669693..5e5126e 100644 --- a/arch/x86/mm/init_32.c +++ b/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;
|  |