diff --git a/kernel.spec b/kernel.spec
index f6e396b4a..ad9e50c90 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1851,6 +1851,9 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 27 2011 Dave Jones <davej@redhat.com>
+- Fix get_gate_vma usage in 32bit NX emulation.
+
 * Fri Aug 26 2011 Chuck Ebbert <cebbert@redhat.com>
 - Add fixes for cifs mount oopses (rhbz#727927 rhbz#731278 rhbz#732934)
 
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index 856b9b95a..fb58c612e 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);