diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-09 10:42:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-09 10:42:21 +0100 |
| commit | 4385428a477559b26736cc3c80d8b68f31126c71 (patch) | |
| tree | 8eb0cbc78e79c368687fa13a1e0674ae537f830f /arch/x86/mm/setup_nx.c | |
| parent | perf, x86: P4 PMU - Fix unflagged overflows handling (diff) | |
| parent | dynamic debug: Fix build issue with older gcc (diff) | |
| download | linux-4385428a477559b26736cc3c80d8b68f31126c71.tar.xz linux-4385428a477559b26736cc3c80d8b68f31126c71.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/x86/mm/setup_nx.c')
| -rw-r--r-- | arch/x86/mm/setup_nx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c index a3250aa34086..410531d3c292 100644 --- a/arch/x86/mm/setup_nx.c +++ b/arch/x86/mm/setup_nx.c @@ -41,7 +41,7 @@ void __init x86_report_nx(void) { if (!cpu_has_nx) { printk(KERN_NOTICE "Notice: NX (Execute Disable) protection " - "missing in CPU or disabled in BIOS!\n"); + "missing in CPU!\n"); } else { #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) if (disable_nx) { |