Commit 54e63f3a authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: ifdef 32-bit specific setup in init_memory_mapping() 



Impact: cleanup

Enabling NX, PSE, and PGE are only required on 32-bit so ifdef them
in both versions of the function.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1236257708-27269-5-git-send-email-penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e7179853

arch/x86/mm/init_32.c

+2 −0
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
	use_gbpages = direct_gbpages;

#endif



#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_PAE

	set_nx();

	if (nx_enabled)
@@ -963,6 +964,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
		set_in_cr4(X86_CR4_PGE);

		__supported_pte_mask |= _PAGE_GLOBAL;

	}

#endif



	if (use_gbpages)

		page_size_mask |= 1 << PG_LEVEL_1G;

arch/x86/mm/init_64.c

+18 −0
Original line number Diff line number Diff line
@@ -712,6 +712,24 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
	use_gbpages = direct_gbpages;

#endif



#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_PAE

	set_nx();

	if (nx_enabled)

		printk(KERN_INFO "NX (Execute Disable) protection: active\n");

#endif



	/* Enable PSE if available */

	if (cpu_has_pse)

		set_in_cr4(X86_CR4_PSE);



	/* Enable PGE if available */

	if (cpu_has_pge) {

		set_in_cr4(X86_CR4_PGE);

		__supported_pte_mask |= _PAGE_GLOBAL;

	}

#endif



	if (use_gbpages)

		page_size_mask |= 1 << PG_LEVEL_1G;

	if (use_pse)

CRA Git | Maintained and supported by SUSTech CRA and CCSE