luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, cpu: Only CPU features determine NX capabilities

Browse Source 
Fix the NX feature boot warning when NX is missing to correctly
reflect that BIOSes cannot disable NX now.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-5-git-send-email-kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Kees Cook 2010-11-10 10:35:54 -08:00 committed by H. Peter Anvin
parent ebba638ae7
commit 6036f373ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ void __init x86_report_nx(void)
{ {
if (!cpu_has_nx) { if (!cpu_has_nx) {
printk(KERN_NOTICE "Notice: NX (Execute Disable) protection " printk(KERN_NOTICE "Notice: NX (Execute Disable) protection "
"missing in CPU or disabled in BIOS!\n"); "missing in CPU!\n");
} else { } else {
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
if (disable_nx) { if (disable_nx) {