[kernel/f12/master] Linux 2.6.32.21-rc1

[Chuck Ebbert]

commit 4db245b3bacdaae59775458cd6c889b8684eb78b
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Wed Aug 25 20:14:08 2010 -0400

    Linux 2.6.32.21-rc1
    
    Drop merged patches:
      drm-i915-add-reclaimable-to-page-allocations.patch
      drm-i915-fix-hibernate-memory-corruption.patch
    Fix up execshield and DRM upgrade patches to apply after 2.6.32.21

 drm-i915-add-reclaimable-to-page-allocations.patch |   48 --------------------
 drm-i915-fix-hibernate-memory-corruption.patch     |   41 -----------------
 drm-upgrayedd.patch                                |    6 +-
 kernel.spec                                        |   18 ++++---
 linux-2.6-execshield.patch                         |   11 +++--
 sources                                            |    1 +
 6 files changed, 20 insertions(+), 105 deletions(-)
---
diff --git a/drm-upgrayedd.patch b/drm-upgrayedd.patch
index 752567b..08f039b 100644
--- a/drm-upgrayedd.patch
+++ b/drm-upgrayedd.patch
@@ -817,9 +817,9 @@ index a75ca63..766c468 100644
  	atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
  	++file_priv->ioctl_count;
 @@ -471,7 +502,13 @@ int drm_ioctl(struct inode *inode, struct file *filp,
- 				goto err_i1;
- 			}
- 		}
+ 		} else
+ 			memset(kdata, 0, _IOC_SIZE(cmd));
+ 
 -		retcode = func(dev, kdata, file_priv);
 +		if (ioctl->flags & DRM_UNLOCKED)
 +			retcode = func(dev, kdata, file_priv);
diff --git a/kernel.spec b/kernel.spec
index 43f977f..d7bc01e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -47,7 +47,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 164
+%global baserelease 165
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -59,9 +59,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 20
+%define stable_update 21
 # 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}
@@ -722,8 +722,6 @@ Patch1813: drm-radeon-pm.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1820: drm-intel-no-tv-hotplug.patch
-Patch1821: drm-i915-fix-hibernate-memory-corruption.patch
-Patch1822: drm-i915-add-reclaimable-to-page-allocations.patch
 Patch1823: drm-intel-945gm-stability-fixes.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
@@ -1461,9 +1459,6 @@ ApplyPatch drm-intel-acpi-populate-didl.patch
 ApplyPatch drm-intel-make-lvds-work.patch
 # gm45 stability fixes
 ApplyPatch drm-intel-945gm-stability-fixes.patch
-# hibernation memory corruption fixes
-ApplyPatch drm-i915-fix-hibernate-memory-corruption.patch
-ApplyPatch drm-i915-add-reclaimable-to-page-allocations.patch
 
 ApplyPatch drm-nouveau-g80-ctxprog.patch
 ApplyPatch drm-nouveau-tvout-disable.patch
@@ -2202,6 +2197,13 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Aug 25 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.21-165.rc1
+- Linux 2.6.32.21-rc1
+- Drop merged patches:
+    drm-i915-add-reclaimable-to-page-allocations.patch
+    drm-i915-fix-hibernate-memory-corruption.patch
+- Fix up execshield and DRM upgrade patches to apply after 2.6.32.21
+
 * Sat Aug 21 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.20-164
 - Linux 2.6.32.20
 - Drop merged patches:
diff --git a/linux-2.6-execshield.patch b/linux-2.6-execshield.patch
index 61e444f..8f0edb2 100644
--- a/linux-2.6-execshield.patch
+++ b/linux-2.6-execshield.patch
@@ -737,15 +737,16 @@ index 73f5e4b..814b95f 100644
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -389,6 +402,8 @@ static inline void
- __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
- 		struct vm_area_struct *prev, struct rb_node *rb_parent)
+@@ -389,6 +402,9 @@ static inline void
  {
+ 	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;
 @@ -491,6 +506,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
diff --git a/sources b/sources
index 027f2bd..e0e64a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
 37cd37164dd7f288dc84f831fc33a598  patch-2.6.32.20.bz2
+6341e8071147c9a270f5119c4a32c850  patch-2.6.32.21-rc1.bz2