Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6036f373ea03687d355634fa70fb04baa95ab75e

Authored by Kees Cook
Committed by H. Peter Anvin
1 parent ebba638ae7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/x86/mm/setup_nx.c
Diff comments   View file @ 6036f37
... ... @@ -41,7 +41,7 @@
41 41 {
42 42 if (!cpu_has_nx) {
43 43 printk(KERN_NOTICE "Notice: NX (Execute Disable) protection "
44   - "missing in CPU or disabled in BIOS!\n");
  44 + "missing in CPU!\n");
45 45 } else {
46 46 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
47 47 if (disable_nx) {