[kernel] NX emulation fixes

[Dave Jones]

commit acf0fc7b147a8873f4bd61b47d3073e03e692532
Author: Dave Jones <davej at redhat.com>
Date:   Sat Aug 27 13:27:38 2011 -0400

    NX emulation fixes
    
    Fix get_gate_vma usage in i386 NX emulation
    Fix up dependancy on the dropped randomization patch.

 kernel.spec                       |    4 ++++
 linux-2.6-i386-nx-emulation.patch |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 30afcb9..02e35f4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2033,6 +2033,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Aug 27 2011 Dave Jones <davej at redhat.com>
+- Fix get_gate_vma usage in i386 NX emulation
+  Fix up dependancy on the dropped randomization patch.
+
 * Sat Aug 27 2011 Josh Boyer <jwboyer at redhat.com>
 - Linux 3.1-rc3-git6
 
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index 856b9b9..33a3437 100644
--- a/linux-2.6-i386-nx-emulation.patch
+++ b/linux-2.6-i386-nx-emulation.patch
@@ -249,7 +249,7 @@
 +		for (vma = current->mm->mmap; vma; vma = vma->vm_next)
 +			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
 +				limit = vma->vm_end;
-+		vma = get_gate_vma(current);
++		vma = get_gate_vma(current->mm);
 +		if (vma && (vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
 +			limit = vma->vm_end;
 +		spin_unlock(&current->mm->page_table_lock);
@@ -606,7 +606,7 @@ index 57d1868..29c0c35 100644
 +	/* in the case of NX emulation, shove the brk segment way out of the
 +	   way of the exec randomization area, since it can collide with
 +	   future allocations if not. */
-+	if ( (mm->get_unmapped_exec_area == arch_get_unmapped_exec_area) &&
++	if ( (mm->get_unmapped_exec == arch_get_unmapped_exec_area) &&
 +	     (mm->brk < 0x08000000) ) {
 +		bump = (TASK_SIZE/6);
 +	}