[PATCH] jffs/jffs2: remove wrong function prototypes

[linux-2.6] / security / keys / process_keys.c

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 34db087bbcc7d0cdcb08266bdaf840067adb1311..c089f78fb94ec170dbd042f08a4a61b9915c526e 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;
@@ -678,7 +678,7 @@ long join_session_keyring(const char *name)
                keyring = keyring_alloc(name, tsk->uid, tsk->gid, 0, NULL);
                if (IS_ERR(keyring)) {
                        ret = PTR_ERR(keyring);
-                       goto error;
+                       goto error2;
                }
        }
        else if (IS_ERR(keyring)) {