提交 6036f373 编写于 作者: K Kees Cook 提交者: H. Peter Anvin

x86, cpu: Only CPU features determine NX capabilities

Fix the NX feature boot warning when NX is missing to correctly
reflect that BIOSes cannot disable NX now.
Signed-off-by: NKees Cook <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-5-git-send-email-kees.cook@canonical.com>
Acked-by: NPekka Enberg <penberg@kernel.org>
Acked-by: NAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
上级 ebba638a
...@@ -41,7 +41,7 @@ void __init x86_report_nx(void) ...@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册