aio: remove INIT_KIOCTX

[safe/jmp/linux-2.6] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 9de41cc..d87247d 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -5,6 +5,7 @@
 #include <linux/irqflags.h>
 #include <linux/utsname.h>
 #include <linux/lockdep.h>
+#include <linux/ftrace.h>
 #include <linux/ipc.h>
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
@@ -12,19 +13,7 @@
 #include <net/net_namespace.h>
 
 extern struct files_struct init_files;
-
-#define INIT_KIOCTX(name, which_mm) \
-{                                                      \
-       .users          = ATOMIC_INIT(1),               \
-       .dead           = 0,                            \
-       .mm             = &which_mm,                    \
-       .user_id        = 0,                            \
-       .next           = NULL,                         \
-       .wait           = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \
-       .ctx_lock       = __SPIN_LOCK_UNLOCKED(name.ctx_lock), \
-       .reqs_active    = 0U,                           \
-       .max_reqs       = ~0U,                          \
-}
+extern struct fs_struct init_fs;
 
 #define INIT_MM(name) \
 {                                                              \
@@ -47,6 +36,11 @@ extern struct files_struct init_files;
        .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
        .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
        .rlim           = INIT_RLIMITS,                                 \
+       .cputimer       = {                                             \
+               .cputime = INIT_CPUTIME,                                \
+               .running = 0,                                           \
+               .lock = __SPIN_LOCK_UNLOCKED(sig.cputimer.lock),        \
+       },                                                              \
 }
 
 extern struct nsproxy init_nsproxy;
@@ -57,7 +51,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 +108,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)
@@ -155,6 +135,7 @@ extern struct cred init_cred;
                .nr_cpus_allowed = NR_CPUS,                             \
        },                                                              \
        .tasks          = LIST_HEAD_INIT(tsk.tasks),                    \
+       .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \
        .ptraced        = LIST_HEAD_INIT(tsk.ptraced),                  \
        .ptrace_entry   = LIST_HEAD_INIT(tsk.ptrace_entry),             \
        .real_parent    = &tsk,                                         \
@@ -162,8 +143,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,                                     \
@@ -190,6 +173,7 @@ extern struct cred init_cred;
        INIT_IDS                                                        \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
+       INIT_FTRACE_GRAPH                                               \
 }