From: James Morris <jmorris@namei.org>
Date: Thu, 6 May 2010 12:21:04 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=043b4d40f53131c5f72eca2a46555fe35328a930;p=deliverable%2Flinux.git

Merge branch 'master' into next

Conflicts:
	security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

Signed-off-by: James Morris <jmorris@namei.org>
---

043b4d40f53131c5f72eca2a46555fe35328a930
diff --cc security/keys/keyring.c
index 29de5ee3457b,1e4b0037935c..3f425a65906f
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@@ -17,9 -17,14 +17,14 @@@
  #include <linux/seq_file.h>
  #include <linux/err.h>
  #include <keys/keyring-type.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
  #include "internal.h"
  
+ #define rcu_dereference_locked_keyring(keyring)				\
+ 	(rcu_dereference_protected(					\
+ 		(keyring)->payload.subscriptions,			\
+ 		rwsem_is_locked((struct rw_semaphore *)&(keyring)->sem)))
+ 
  /*
   * when plumbing the depths of the key tree, this sets a hard limit set on how
   * deep we're willing to go