Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-omap-h63xx.git] / security / keys / process_keys.c

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 34db087bbcc7d0cdcb08266bdaf840067adb1311..9b0369c5a223acbf951178e87ebbb0789458b507 100644 (file)
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -234,7 +234,7 @@ static int install_session_keyring(struct task_struct *tsk,
        ret = 0;
 
        /* we're using RCU on the pointer */
-       synchronize_kernel();
+       synchronize_rcu();
        key_put(old);
  error:
        return ret;