Commit 62436fe9 authored by Ingo Molnar's avatar Ingo Molnar

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: default avatarIngo Molnar <mingo@elte.hu>
parent 4fcb2083
...@@ -273,6 +273,7 @@ typedef struct page *pgtable_t; ...@@ -273,6 +273,7 @@ typedef struct page *pgtable_t;
extern pteval_t __supported_pte_mask; extern pteval_t __supported_pte_mask;
extern int nx_enabled; extern int nx_enabled;
extern void set_nx(void);
#define pgprot_writecombine pgprot_writecombine #define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot); extern pgprot_t pgprot_writecombine(pgprot_t prot);
......
...@@ -605,7 +605,7 @@ static int __init noexec_setup(char *str) ...@@ -605,7 +605,7 @@ static int __init noexec_setup(char *str)
} }
early_param("noexec", noexec_setup); early_param("noexec", noexec_setup);
static void __init set_nx(void) void __init set_nx(void)
{ {
unsigned int v[4], l, h; unsigned int v[4], l, h;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment