Once "x86, mm: Report state of NX protections during boot"[1] is in the Lucid
kernel, "UBUNTU: SAUCE: [x86] implement cs-limit nx-emulation for ia32"
will not cleanly apply. This patch is a replacement for that one.

The upstream fix functionally contains the following commits, which can
be dropped at the next rebase:

"UBUNTU: SAUCE: Fix nx_enable reporting"
"UBUNTU: SAUCE: [x86] fix report of cs-limit nx-emulation"

-Kees

[1] http://git.kernel.org/?p=linux/kernel/git/x86/linux-2.6-tip.git;a=commitdiff;h=4b0f3b81eb33ef18283aa71440c ccfede1753ae0

--
Kees Cook
Ubuntu Security Team