[kernel] Linux 2.6.36-rc1-git4

[Chuck Ebbert]

commit f7c7ff50b7149ecf6c8a13b52b38be6c983d9bab
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Sun Aug 22 08:22:19 2010 -0400

    Linux 2.6.36-rc1-git4

 kernel.spec                       |    8 ++++++--
 linux-2.6-i386-nx-emulation.patch |   11 ++++++-----
 sources                           |    2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ea76afe..1a29f07 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 6
+%global baserelease 7
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1861,6 +1861,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Sun Aug 22 2010 Chuck Ebbert <cebbert at redhat.com> - 2.6.36-0.7.rc1.git4
+- Linux 2.6.36-rc1-git4
+- Fix context in linux-2.6-i386-nx-emulation.patch
+
 * Sat Aug 21 2010 Chuck Ebbert <cebbert at redhat.com> - 2.6.36-0.6.rc1.git3
 - Drop utrace patch that causes hang on boot.
 
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index a47e99d..224fe05 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)
diff --git a/sources b/sources
index d247483..0a9c152 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 091abeb4684ce03d1d936851618687b6  linux-2.6.35.tar.bz2
 4f51963b5e076fb87ab32bda229a524f  patch-2.6.36-rc1.bz2
-e6b13a5770a0ee6bdd0c241e975420cd  patch-2.6.36-rc1-git3.bz2
+017aab6e1b6fcd231e7c5b2aa655f8c2  patch-2.6.36-rc1-git4.bz2