[XFS] Fix merge failures

[pandora-kernel.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 9de41cc..959f552 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -57,7 +57,6 @@ extern struct nsproxy init_nsproxy;
        .mnt_ns         = NULL,                                         \
        INIT_NET_NS(net_ns)                                             \
        INIT_IPC_NS(ipc_ns)                                             \
-       .user_ns        = &init_user_ns,                                \
 }
 
 #define INIT_SIGHAND(sighand) {                                                \
@@ -115,19 +114,6 @@ extern struct group_info init_groups;
 
 extern struct cred init_cred;
 
-#define INIT_CRED(p)                                           \
-{                                                              \
-       .usage                  = ATOMIC_INIT(3),               \
-       .securebits             = SECUREBITS_DEFAULT,           \
-       .cap_inheritable        = CAP_INIT_INH_SET,             \
-       .cap_permitted          = CAP_FULL_SET,                 \
-       .cap_effective          = CAP_INIT_EFF_SET,             \
-       .cap_bset               = CAP_INIT_BSET,                \
-       .user                   = INIT_USER,                    \
-       .group_info             = &init_groups,                 \
-       .lock                   = __SPIN_LOCK_UNLOCKED(p.lock), \
-}
-
 /*
  *  INIT_TASK is used to set up the first task table, touch at
  * your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -162,8 +148,10 @@ extern struct cred init_cred;
        .children       = LIST_HEAD_INIT(tsk.children),                 \
        .sibling        = LIST_HEAD_INIT(tsk.sibling),                  \
        .group_leader   = &tsk,                                         \
-       .__temp_cred    = INIT_CRED(tsk.__temp_cred),                   \
-       .cred           = &tsk.__temp_cred,                             \
+       .real_cred      = &init_cred,                                   \
+       .cred           = &init_cred,                                   \
+       .cred_exec_mutex =                                              \
+                __MUTEX_INITIALIZER(tsk.cred_exec_mutex),              \
        .comm           = "swapper",                                    \
        .thread         = INIT_THREAD,                                  \
        .fs             = &init_fs,                                     \