[PATCH] lockdep: name some old style locks

[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 ceecf69..733790d 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -6,6 +6,7 @@
 #include <linux/irqflags.h>
 #include <linux/utsname.h>
 #include <linux/lockdep.h>
+#include <linux/ipc.h>
 
 #define INIT_FDTABLE \
 {                                                      \
@@ -72,10 +73,10 @@
 extern struct nsproxy init_nsproxy;
 #define INIT_NSPROXY(nsproxy) {                                                \
        .count          = ATOMIC_INIT(1),                               \
-       .nslock         = SPIN_LOCK_UNLOCKED,                           \
+       .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
        .uts_ns         = &init_uts_ns,                                 \
-       .ipc_ns         = &init_ipc_ns,                                 \
        .namespace      = NULL,                                         \
+       INIT_IPC_NS(ipc_ns)                                             \
 }
 
 #define INIT_SIGHAND(sighand) {                                                \