x86: move init_memory_mapping() to common mm/init.c, build fix on 32-bit PAE (62436fe9) · Commits · 戴 / test

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 −0

Original line number	Diff line number	Diff line
		@@ -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);

arch/x86/mm/init_32.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message