AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

x86: move init_memory_mapping() to common mm/init.c, build fix on 32-bit PAE

Browse Source 
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>
This commit is contained in:
Ingo Molnar 2009-03-05 14:39:03 +01:00
parent 4fcb208391
commit 62436fe9ee
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/pgtable_types.h
View File

@ -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);

2
arch/x86/mm/init_32.c
View File

@ -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;