[kernel/f14/master] Linux 2.6.35.4-rc1

[Chuck Ebbert]

commit 3e8e94e0cd83d003c42f10f61b34de72a278856c
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Wed Aug 25 08:17:36 2010 -0400

    Linux 2.6.35.4-rc1
    
    Fix up linux-2.6-i386-nx-emulation.patch for 2.6.35.4

 kernel.spec                       |   10 +++++++---
 linux-2.6-i386-nx-emulation.patch |   11 ++++++-----
 sources                           |    1 +
 3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index d1a190d..496cfd7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 10
+%global baserelease 11
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -60,9 +60,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1891,6 +1891,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 25 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.35.4-11.rc1
+- Linux 2.6.35.4-rc1
+- Fix up linux-2.6-i386-nx-emulation.patch for 2.6.35.4
+
 * Sat Aug 21 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.35.3-10
 - Linux 2.6.35.3
 - Drop merged patches:
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 cd4a453..bd22fb7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 091abeb4684ce03d1d936851618687b6  linux-2.6.35.tar.bz2
 a921f7789b7047b84f30a6f283cf6d07  patch-2.6.35.3.bz2
+33afb339ec201d14792ba66e4c20985e  patch-2.6.35.4-rc1.bz2