From 0030862ddf2e0a719ecead0a940af03ce37ce6d3 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 16 Oct 2007 23:30:10 -0700 Subject: [PATCH] --- yaml --- r: 70692 b: refs/heads/master c: 1efd24fa05976ea20582c18dd4b80d7311b9b94a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/init_task.h | 1 - trunk/include/linux/nsproxy.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 23c87397e808..e50d8179dfd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 970a8645ca051225a32401e4c80b50fc0a49c081 +refs/heads/master: 1efd24fa05976ea20582c18dd4b80d7311b9b94a diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h index 3a619f57a2b2..d4b2f1c76e12 100644 --- a/trunk/include/linux/init_task.h +++ b/trunk/include/linux/init_task.h @@ -76,7 +76,6 @@ extern struct nsproxy init_nsproxy; #define INIT_NSPROXY(nsproxy) { \ .pid_ns = &init_pid_ns, \ .count = ATOMIC_INIT(1), \ - .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \ .uts_ns = &init_uts_ns, \ .mnt_ns = NULL, \ INIT_NET_NS(net_ns) \ diff --git a/trunk/include/linux/nsproxy.h b/trunk/include/linux/nsproxy.h index bec4485e3d76..033a648709b6 100644 --- a/trunk/include/linux/nsproxy.h +++ b/trunk/include/linux/nsproxy.h @@ -23,7 +23,6 @@ struct pid_namespace; */ struct nsproxy { atomic_t count; - spinlock_t nslock; struct uts_namespace *uts_ns; struct ipc_namespace *ipc_ns; struct mnt_namespace *mnt_ns;