Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075)

This commit is contained in:
Josh Boyer 2012-03-29 10:58:35 -04:00
commit 381fffb100
2 changed files with 51 additions and 1 deletions

View file

@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 7
%global baserelease 8
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -659,6 +659,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
Patch383: linux-2.6-defaults-aspm.patch
@ -1303,6 +1304,7 @@ ApplyPatch taint-vbox.patch
#
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
#
# bugfixes to drivers and filesystems
@ -2211,6 +2213,7 @@ fi
%changelog
* Thu Mar 29 2012 Josh Boyer <jwboyer@redhat.com>
- Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075)
- iwl{wifi,legacy}: Fix warnings on remove interface from Stanislaw Gruszka
(rhbz 770467)