Commit 6036f373 authored Nov 10, 2010 by Kees Cook Committed by H. Peter Anvin Nov 10, 2010

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: 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>

parent ebba638a

arch/x86/mm/setup_nx.c

+1 −1

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