summaryrefslogtreecommitdiffstats
path: root/linux-2.6-i386-nx-emulation.patch
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2010-08-22 08:22:19 -0400
committerChuck Ebbert <cebbert@redhat.com>2010-08-22 08:22:19 -0400
commitf7c7ff50b7149ecf6c8a13b52b38be6c983d9bab (patch)
tree07297c7dd7691a54eab4ce7b6c69454e6c8f9227 /linux-2.6-i386-nx-emulation.patch
parentf790f66448f0b87dabec3ddbc0aed374ad62f009 (diff)
downloadkernel-f7c7ff50b7149ecf6c8a13b52b38be6c983d9bab.tar.gz
kernel-f7c7ff50b7149ecf6c8a13b52b38be6c983d9bab.tar.xz
kernel-f7c7ff50b7149ecf6c8a13b52b38be6c983d9bab.zip
Linux 2.6.36-rc1-git4
Diffstat (limited to 'linux-2.6-i386-nx-emulation.patch')
-rw-r--r--linux-2.6-i386-nx-emulation.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index a47e99d47..224fe0587 100644
--- a/linux-2.6-i386-nx-emulation.patch
+++ b/linux-2.6-i386-nx-emulation.patch
@@ -538,15 +538,16 @@
static void unmap_region(struct mm_struct *mm,
struct vm_area_struct *vma, struct vm_area_struct *prev,
unsigned long start, unsigned long end);
-@@ -388,6 +401,8 @@
- __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
- struct vm_area_struct *prev, struct rb_node *rb_parent)
+@@ -388,6 +401,9 @@
{
+ struct vm_area_struct *next;
+
+ if (vma->vm_flags & VM_EXEC)
+ arch_add_exec_range(mm, vma->vm_end);
++
+ vma->vm_prev = prev;
if (prev) {
- vma->vm_next = prev->vm_next;
- prev->vm_next = vma;
+ next = prev->vm_next;
@@ -489,6 +504,8 @@
rb_erase(&vma->vm_rb, &mm->mm_rb);
if (mm->mmap_cache == vma)