packages: kernel/kernel-small_fixes.patch - removed hunks applied in 3.0-rc6

[baggins]

Author: baggins                      Date: Mon Jul 11 09:33:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed hunks applied in 3.0-rc6

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.28 packages/kernel/kernel-small_fixes.patch:1.29
--- packages/kernel/kernel-small_fixes.patch:1.28	Tue Jul  5 22:39:19 2011
+++ packages/kernel/kernel-small_fixes.patch	Mon Jul 11 11:33:39 2011
@@ -59,73 +59,3 @@
  	/* block receiver */
  	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
  }
-
-
-
-blk_cleanup_queue() calls elevator_exit() and after this, we can't
-touch the elevator without oopsing.  __elv_next_request() must check
-for this state because in the refcounted queue model, we can still
-call it after blk_cleanup_queue() has been called.
-
-This was reported as causing an oops attributable to scsi.
-
-Signed-off-by: James Bottomley <James.Bottomley at suse.de>
----
- block/blk.h |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/block/blk.h b/block/blk.h
-index 6126346..4df474d 100644
---- a/block/blk.h
-+++ b/block/blk.h
-@@ -62,7 +62,8 @@ static inline struct request *__elv_next_request(struct request_queue *q)
- 			return rq;
- 		}
- 
--		if (!q->elevator->ops->elevator_dispatch_fn(q, 0))
-+		if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) ||
-+		    !q->elevator->ops->elevator_dispatch_fn(q, 0))
- 			return NULL;
- 	}
- }
--- 
-1.7.4.1
-
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.htmlcommit a5b2c5b2ad5853591a6cac6134cd0f599a720865
-Author: Kees Cook <kees.cook at canonical.com>
-Date:   Tue May 31 11:31:41 2011 -0700
-
-    AppArmor: fix oops in apparmor_setprocattr
-    
-    When invalid parameters are passed to apparmor_setprocattr a NULL deref
-    oops occurs when it tries to record an audit message. This is because
-    it is passing NULL for the profile parameter for aa_audit. But aa_audit
-    now requires that the profile passed is not NULL.
-    
-    Fix this by passing the current profile on the task that is trying to
-    setprocattr.
-    
-    Signed-off-by: Kees Cook <kees at ubuntu.com>
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Cc: stable at kernel.org
-    Signed-off-by: James Morris <jmorris at namei.org>
-
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index ae3a698..ec1bcec 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
- 			sa.aad.op = OP_SETPROCATTR;
- 			sa.aad.info = name;
- 			sa.aad.error = -EINVAL;
--			return aa_audit(AUDIT_APPARMOR_DENIED, NULL, GFP_KERNEL,
-+			return aa_audit(AUDIT_APPARMOR_DENIED,
-+					__aa_current_profile(), GFP_KERNEL,
- 					&sa, NULL);
- 		}
- 	} else if (strcmp(name, "exec") == 0) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.28&r2=1.29&f=u