rpms/kernel/devel drm_gem_object_alloc-i915_gem_alloc_object.patch, NONE, 1.1 kernel.spec, 1.2008, 1.2009 quiet-prove_RCU-in-cgroups.patch, 1.1, 1.2

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18734

Modified Files:
	kernel.spec quiet-prove_RCU-in-cgroups.patch 
Added Files:
	drm_gem_object_alloc-i915_gem_alloc_object.patch 
Log Message:
* Tue Jun 01 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-18
- fix mismerge in i915_gem.c, drm_gem_object_alloc is now
  i915_gem_alloc_object.
- add a hunk to rcu_read{,un}lock in sched_fair too.


drm_gem_object_alloc-i915_gem_alloc_object.patch:
 i915_gem.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE drm_gem_object_alloc-i915_gem_alloc_object.patch ---
>From 3fe5bbc9666069dd38a23da33a35e752d5bf19d7 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date: Tue, 1 Jun 2010 15:41:32 +0100
Subject: drm_gem_object_alloc -> i915_gem_alloc_object

---
 drivers/gpu/drm/i915/i915_gem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a2a5e63..112699f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4623,7 +4623,7 @@ i915_gem_init_pipe_control(struct drm_device *dev)
 	struct drm_i915_gem_object *obj_priv;
 	int ret;
 
-	obj = drm_gem_object_alloc(dev, 4096);
+	obj = i915_gem_alloc_object(dev, 4096);
 	if (obj == NULL) {
 		DRM_ERROR("Failed to allocate seqno page\n");
 		ret = -ENOMEM;
-- 
1.7.0.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2008
retrieving revision 1.2009
diff -u -p -r1.2008 -r1.2009
--- kernel.spec	1 Jun 2010 13:29:10 -0000	1.2008
+++ kernel.spec	1 Jun 2010 15:54:00 -0000	1.2009
@@ -724,6 +724,7 @@ Patch1554: virt_console-rollup.patch
 # DRM
 Patch1800: drm-next.patch
 Patch1801: drm-disable-radeon_pm.patch
+Patch1802: drm_gem_object_alloc-i915_gem_alloc_object.patch
 # nouveau + drm fixes
 Patch1815: drm-nouveau-drm-fixed-header.patch
 Patch1819: drm-intel-big-hammer.patch
@@ -1343,6 +1344,7 @@ ApplyPatch virt_console-rollup.patch
 
 ApplyPatch drm-next.patch
 ApplyPatch drm-disable-radeon_pm.patch
+ApplyPatch drm_gem_object_alloc-i915_gem_alloc_object.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-nouveau-drm-fixed-header.patch
@@ -2057,6 +2059,11 @@ fi
 #                 ||     ||
 
 %changelog
+* Tue Jun 01 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-18
+- fix mismerge in i915_gem.c, drm_gem_object_alloc is now
+  i915_gem_alloc_object.
+- add a hunk to rcu_read{,un}lock in sched_fair too.
+
 * Tue Jun 01 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-17
 - backport writeback fixes from Jens until stable@ picks them up.
 

quiet-prove_RCU-in-cgroups.patch:
 sched_fair.c |    4 ++++
 softlockup.c |    2 ++
 2 files changed, 6 insertions(+)

Index: quiet-prove_RCU-in-cgroups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/quiet-prove_RCU-in-cgroups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- quiet-prove_RCU-in-cgroups.patch	1 Jun 2010 12:51:30 -0000	1.1
+++ quiet-prove_RCU-in-cgroups.patch	1 Jun 2010 15:54:02 -0000	1.2
@@ -12,3 +12,25 @@ index 4b493f6..ada1fcd 100644
  
  	/* initialize timestamp */
  	__touch_softlockup_watchdog();
+diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
+index 5a5ea2c..47ecc56 100644
+--- a/kernel/sched_fair.c
++++ b/kernel/sched_fair.c
+@@ -1272,6 +1272,9 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
+ 	 * effect of the currently running task from the load
+ 	 * of the current CPU:
+ 	 */
++
++	rcu_read_lock();
++
+ 	if (sync) {
+ 		tg = task_group(current);
+ 		weight = current->se.load.weight;
+@@ -1298,6 +1301,7 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
+ 		100*(this_load + effective_load(tg, this_cpu, weight, weight)) <=
+ 		imbalance*(load + effective_load(tg, prev_cpu, 0, weight));
+ 
++	rcu_read_unlock();
+ 	/*
+ 	 * If the currently running task will sleep within
+ 	 * a reasonable amount of time then attract this newly