BugLink: https://bugs.launchpad.net/bugs/454285
Submitted upstream.

This fixes a regression caused by

commit 8bf095f8b62c5fdfe55a8c95be775ea62be7bc10
Author: Kees Cook <kees@ubuntu.com>
Date: Sun Oct 18 09:16:44 2009 -0700
UBUNTU: SAUCE: [x86] fix report of cs-limit nx-emulation

The _PAGE_NX is 0 when compiled for 32bit without PAE, so the previous
attempt to fix the misleading message on 64bit caused 32bit non-PAE to
break (discovered by having problems on suspend/resume).

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Tested-by: Stefan Bader <stefan.bader@canonical.com>
---
arch/x86/mm/init.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 817fa01..6654c44 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -77,7 +77,7 @@ static void __init set_nx(void)
#else
static inline void set_nx(void)
{
- nx_enabled = ( (__supported_pte_mask & _PAGE_NX) == _PAGE_NX );
+ nx_enabled = _PAGE_NX && ((__supported_pte_mask & _PAGE_NX) == _PAGE_NX);
}
#endif

--
1.6.3.3


--------------020800040700080909050901
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

--------------020800040700080909050901--