Merge commit 'v2.6.34-rc6' into sched/core

[karo-tx-linux.git] / kernel / cred.c

diff --git a/kernel/cred.c b/kernel/cred.c
index 62af1816c2352eaa9238887ef567a0b62ab5426f..8f3672a58a1e82a39de67ee4f35e7b2f0c12ac2b 100644 (file)
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -17,7 +17,6 @@
 #include <linux/init_task.h>
 #include <linux/security.h>
 #include <linux/cn_proc.h>
-#include "cred-internals.h"
 
 #if 0
 #define kdebug(FMT, ...) \
@@ -560,8 +559,6 @@ int commit_creds(struct cred *new)
                atomic_dec(&old->user->processes);
        alter_cred_subscribers(old, -2);
 
-       sched_switch_user(task);
-
        /* send notifications */
        if (new->uid   != old->uid  ||
            new->euid  != old->euid ||