summaryrefslogtreecommitdiffstats
path: root/linux-2.6-i386-nx-emulation.patch
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-22 14:45:44 -0500
committerKyle McMartin <kyle@mcmartin.ca>2010-11-22 14:50:23 -0500
commit0f865c9c5e1cc353f4180723bdc0b3575d1ab60c (patch)
tree2df686384eef844491cee990c49fb8f25813128d /linux-2.6-i386-nx-emulation.patch
parentf6dd1f4eacc516221ac8f4a7038ab8b7a8122768 (diff)
downloadkernel-0f865c9c5e1cc353f4180723bdc0b3575d1ab60c.tar.gz
kernel-0f865c9c5e1cc353f4180723bdc0b3575d1ab60c.tar.xz
kernel-0f865c9c5e1cc353f4180723bdc0b3575d1ab60c.zip
fix incorrect reporting of whether nx is disabled or not
Thanks to Kees Cook for noticing. Message-ID: <20101121070342.GE4617@outflux.net>
Diffstat (limited to 'linux-2.6-i386-nx-emulation.patch')
-rw-r--r--linux-2.6-i386-nx-emulation.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index 582ce627d..24a2ed500 100644
--- a/linux-2.6-i386-nx-emulation.patch
+++ b/linux-2.6-i386-nx-emulation.patch
@@ -384,7 +384,7 @@
void __init x86_report_nx(void)
{
if (!cpu_has_nx) {
-+ if (disable_nx)
++ if (!disable_nx)
+ printk(KERN_INFO "Using x86 segment limits to approximate NX protection\n");
+ else
+