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/i386/kernel | |
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/i386/kernel')
-rw-r--r-- | arch/i386/kernel/init_task.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/init_task.c b/arch/i386/kernel/init_task.c index bd97f69ac34f..cff95d10a4d8 100644 --- a/arch/i386/kernel/init_task.c +++ b/arch/i386/kernel/init_task.c | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <linux/init_task.h> | 5 | #include <linux/init_task.h> |
6 | #include <linux/fs.h> | 6 | #include <linux/fs.h> |
7 | #include <linux/mqueue.h> | 7 | #include <linux/mqueue.h> |
8 | #include <linux/nsproxy.h> | ||
9 | 8 | ||
10 | #include <asm/uaccess.h> | 9 | #include <asm/uaccess.h> |
11 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES; | |||
16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
18 | struct mm_struct init_mm = INIT_MM(init_mm); | 17 | struct mm_struct init_mm = INIT_MM(init_mm); |
19 | struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy); | ||
20 | 18 | ||
21 | EXPORT_SYMBOL(init_mm); | 19 | EXPORT_SYMBOL(init_mm); |
22 | 20 | ||