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: Pekka 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: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
e7179853e7
commit
54e63f3a42
2 changed files with 20 additions and 0 deletions
|
@ -948,6 +948,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
|
||||||
use_gbpages = direct_gbpages;
|
use_gbpages = direct_gbpages;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_X86_32
|
||||||
#ifdef CONFIG_X86_PAE
|
#ifdef CONFIG_X86_PAE
|
||||||
set_nx();
|
set_nx();
|
||||||
if (nx_enabled)
|
if (nx_enabled)
|
||||||
|
@ -963,6 +964,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
|
||||||
set_in_cr4(X86_CR4_PGE);
|
set_in_cr4(X86_CR4_PGE);
|
||||||
__supported_pte_mask |= _PAGE_GLOBAL;
|
__supported_pte_mask |= _PAGE_GLOBAL;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (use_gbpages)
|
if (use_gbpages)
|
||||||
page_size_mask |= 1 << PG_LEVEL_1G;
|
page_size_mask |= 1 << PG_LEVEL_1G;
|
||||||
|
|
|
@ -712,6 +712,24 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
|
||||||
use_gbpages = direct_gbpages;
|
use_gbpages = direct_gbpages;
|
||||||
#endif
|
#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)
|
if (use_gbpages)
|
||||||
page_size_mask |= 1 << PG_LEVEL_1G;
|
page_size_mask |= 1 << PG_LEVEL_1G;
|
||||||
if (use_pse)
|
if (use_pse)
|
||||||
|
|
Reference in a new issue