summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-03-29 10:58:35 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-03-29 11:04:44 -0400
commit993b5199f8d24787786ef33da16097419ee9796d (patch)
treea3eb34b3972cc0f14748a72c2793c5ca8db12a6d /kernel.spec
parentaf856217e097ba4c16dc1e636138446a02970805 (diff)
downloadkernel-993b5199f8d24787786ef33da16097419ee9796d.tar.gz
kernel-993b5199f8d24787786ef33da16097419ee9796d.tar.xz
kernel-993b5199f8d24787786ef33da16097419ee9796d.zip
Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index a50a8afca..f1a7817e5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -652,6 +652,7 @@ Patch09: linux-2.6-upstream-reverts.patch
Patch100: taint-vbox.patch
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
+Patch162: nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
Patch390: linux-2.6-defaults-acpi-video.patch
Patch391: linux-2.6-acpi-video-dos.patch
@@ -1307,6 +1308,7 @@ ApplyPatch taint-vbox.patch
# x86(-64)
ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
ApplyPatch linux-2.6-i386-nx-emulation.patch
+ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
#
# ARM
@@ -2307,6 +2309,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Mar 29 2012 Josh Boyer <jwboyer@redhat.com>
+- Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075)
+
* Wed Mar 28 2012 Josh Boyer <jwboyer@redhat.com>
- Move 9p modules back to main package for KVM (rhbz 807733)