summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-08-27 14:00:14 -0400
committerDave Jones <davej@redhat.com>2011-08-27 14:00:14 -0400
commitc62acbf43a28550deac0866008fb33a151801304 (patch)
treed920edf3a1f2144c5e9342c799a23271da4f4c32 /kernel.spec
parentf29a760a4843bf61dfdb789061c07a9785e64c95 (diff)
downloadkernel-c62acbf43a28550deac0866008fb33a151801304.tar.gz
kernel-c62acbf43a28550deac0866008fb33a151801304.tar.xz
kernel-c62acbf43a28550deac0866008fb33a151801304.zip
Bring back the 32bit mmap randomization patch for now.
NX emulation is still too dependant upon it.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 02e35f40b..b7f45f696 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -645,6 +645,7 @@ Patch09: linux-2.6-upstream-reverts.patch
# Standalone patches
+Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
Patch202: linux-2.6-debug-taint-vm.patch
@@ -1198,6 +1199,7 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
# Architecture patches
# x86(-64)
+ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
ApplyPatch linux-2.6-i386-nx-emulation.patch
#
@@ -2035,7 +2037,8 @@ fi
%changelog
* Sat Aug 27 2011 Dave Jones <davej@redhat.com>
- Fix get_gate_vma usage in i386 NX emulation
- Fix up dependancy on the dropped randomization patch.
+- Bring back the 32bit mmap randomization patch for now.
+ NX emulation is still too dependant upon it.
* Sat Aug 27 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-rc3-git6