Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 1b7bb37624bb0ed67cfd3932888e02b444d8ba07..33c5daacc74338dd0d479f976892659ab308eab8 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -3,6 +3,10 @@
 
 #include <linux/file.h>
 #include <linux/rcupdate.h>
+#include <linux/irqflags.h>
+#include <linux/utsname.h>
+#include <linux/lockdep.h>
+#include <linux/ipc.h>
 
 #define INIT_FDTABLE \
 {                                                      \
@@ -66,6 +70,15 @@
        .session        = 1,                                            \
 }
 
+extern struct nsproxy init_nsproxy;
+#define INIT_NSPROXY(nsproxy) {                                                \
+       .count          = ATOMIC_INIT(1),                               \
+       .nslock         = SPIN_LOCK_UNLOCKED,                           \
+       .uts_ns         = &init_uts_ns,                                 \
+       .namespace      = NULL,                                         \
+       INIT_IPC_NS(ipc_ns)                                             \
+}
+
 #define INIT_SIGHAND(sighand) {                                                \
        .count          = ATOMIC_INIT(1),                               \
        .action         = { { { .sa_handler = NULL, } }, },             \
@@ -115,6 +128,7 @@ extern struct group_info init_groups;
        .files          = &init_files,                                  \
        .signal         = &init_signals,                                \
        .sighand        = &init_sighand,                                \
+       .nsproxy        = &init_nsproxy,                                \
        .pending        = {                                             \
                .list = LIST_HEAD_INIT(tsk.pending.list),               \
                .signal = {{0}}},                                       \
@@ -124,6 +138,8 @@ extern struct group_info init_groups;
        .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
        .fs_excl        = ATOMIC_INIT(0),                               \
        .pi_lock        = SPIN_LOCK_UNLOCKED,                           \
+       INIT_TRACE_IRQFLAGS                                             \
+       INIT_LOCKDEP                                                    \
 }