diff options
author | Serge E. Hallyn <serue@us.ibm.com> | 2006-10-02 05:18:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 10:57:20 -0400 |
commit | 0437eb594e6e5e699248f865482e61034be846d0 (patch) | |
tree | 1cf333f108c6d613f54b2a91fe1ad0f12a04bace /arch/um | |
parent | ab516013ad9ca47f1d3a936fa81303bfbf734d52 (diff) |
[PATCH] nsproxy: move init_nsproxy into kernel/nsproxy.c
Move the init_nsproxy definition out of arch/ into kernel/nsproxy.c. This
avoids all arches having to be updated. Compiles and boots on s390.
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Andrey Savochkin <saw@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/kernel/init_task.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c index 11188af64d86..49ed5ddf0704 100644 --- a/arch/um/kernel/init_task.c +++ b/arch/um/kernel/init_task.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include "linux/sched.h" | 9 | #include "linux/sched.h" |
10 | #include "linux/init_task.h" | 10 | #include "linux/init_task.h" |
11 | #include "linux/mqueue.h" | 11 | #include "linux/mqueue.h" |
12 | #include "linux/nsproxy.h" | ||
13 | #include "asm/uaccess.h" | 12 | #include "asm/uaccess.h" |
14 | #include "asm/pgtable.h" | 13 | #include "asm/pgtable.h" |
15 | #include "user_util.h" | 14 | #include "user_util.h" |
@@ -18,7 +17,6 @@ | |||
18 | 17 | ||
19 | static struct fs_struct init_fs = INIT_FS; | 18 | static struct fs_struct init_fs = INIT_FS; |
20 | struct mm_struct init_mm = INIT_MM(init_mm); | 19 | struct mm_struct init_mm = INIT_MM(init_mm); |
21 | struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy); | ||
22 | static struct files_struct init_files = INIT_FILES; | 20 | static struct files_struct init_files = INIT_FILES; |
23 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 21 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
24 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 22 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |