aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2006-10-02 05:18:07 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 10:57:20 -0400
commit0437eb594e6e5e699248f865482e61034be846d0 (patch)
tree1cf333f108c6d613f54b2a91fe1ad0f12a04bace
parentab516013ad9ca47f1d3a936fa81303bfbf734d52 (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
-rw-r--r--arch/alpha/kernel/init_task.c2
-rw-r--r--arch/arm/kernel/init_task.c2
-rw-r--r--arch/arm26/kernel/init_task.c2
-rw-r--r--arch/frv/kernel/init_task.c2
-rw-r--r--arch/h8300/kernel/init_task.c2
-rw-r--r--arch/i386/kernel/init_task.c2
-rw-r--r--arch/ia64/kernel/init_task.c2
-rw-r--r--arch/m32r/kernel/init_task.c2
-rw-r--r--arch/m68knommu/kernel/init_task.c2
-rw-r--r--arch/mips/kernel/init_task.c2
-rw-r--r--arch/parisc/kernel/init_task.c2
-rw-r--r--arch/powerpc/kernel/init_task.c2
-rw-r--r--arch/s390/kernel/init_task.c2
-rw-r--r--arch/sh/kernel/init_task.c2
-rw-r--r--arch/sh64/kernel/init_task.c2
-rw-r--r--arch/sparc/kernel/init_task.c2
-rw-r--r--arch/sparc64/kernel/init_task.c2
-rw-r--r--arch/um/kernel/init_task.c2
-rw-r--r--arch/v850/kernel/init_task.c2
-rw-r--r--arch/x86_64/kernel/init_task.c2
-rw-r--r--kernel/nsproxy.c3
21 files changed, 3 insertions, 40 deletions
diff --git a/arch/alpha/kernel/init_task.c b/arch/alpha/kernel/init_task.c
index 83d09021ed97..835d09a7b332 100644
--- a/arch/alpha/kernel/init_task.c
+++ b/arch/alpha/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#include <asm/uaccess.h> 8#include <asm/uaccess.h>
10 9
11 10
@@ -14,7 +13,6 @@ static struct files_struct init_files = INIT_FILES;
14static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 13static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
15static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 14static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
16struct mm_struct init_mm = INIT_MM(init_mm); 15struct mm_struct init_mm = INIT_MM(init_mm);
17struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
18struct task_struct init_task = INIT_TASK(init_task); 16struct task_struct init_task = INIT_TASK(init_task);
19 17
20EXPORT_SYMBOL(init_mm); 18EXPORT_SYMBOL(init_mm);
diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c
index 80f5eeb6d3a8..a00cca0000bd 100644
--- a/arch/arm/kernel/init_task.c
+++ b/arch/arm/kernel/init_task.c
@@ -8,7 +8,6 @@
8#include <linux/init.h> 8#include <linux/init.h>
9#include <linux/init_task.h> 9#include <linux/init_task.h>
10#include <linux/mqueue.h> 10#include <linux/mqueue.h>
11#include <linux/nsproxy.h>
12 11
13#include <asm/uaccess.h> 12#include <asm/uaccess.h>
14#include <asm/pgtable.h> 13#include <asm/pgtable.h>
@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES;
18static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 17static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
19static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 18static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
20struct mm_struct init_mm = INIT_MM(init_mm); 19struct mm_struct init_mm = INIT_MM(init_mm);
21struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
22 20
23EXPORT_SYMBOL(init_mm); 21EXPORT_SYMBOL(init_mm);
24 22
diff --git a/arch/arm26/kernel/init_task.c b/arch/arm26/kernel/init_task.c
index 678c7b57f9c7..4191565b889b 100644
--- a/arch/arm26/kernel/init_task.c
+++ b/arch/arm26/kernel/init_task.c
@@ -11,7 +11,6 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/init_task.h> 12#include <linux/init_task.h>
13#include <linux/mqueue.h> 13#include <linux/mqueue.h>
14#include <linux/nsproxy.h>
15 14
16#include <asm/uaccess.h> 15#include <asm/uaccess.h>
17#include <asm/pgtable.h> 16#include <asm/pgtable.h>
@@ -21,7 +20,6 @@ static struct files_struct init_files = INIT_FILES;
21static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 20static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
22static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 21static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
23struct mm_struct init_mm = INIT_MM(init_mm); 22struct mm_struct init_mm = INIT_MM(init_mm);
24struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
25 23
26EXPORT_SYMBOL(init_mm); 24EXPORT_SYMBOL(init_mm);
27 25
diff --git a/arch/frv/kernel/init_task.c b/arch/frv/kernel/init_task.c
index 5ec27422bfe3..22993932b3fc 100644
--- a/arch/frv/kernel/init_task.c
+++ b/arch/frv/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;
16static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 15static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
17static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 16static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
18struct mm_struct init_mm = INIT_MM(init_mm); 17struct mm_struct init_mm = INIT_MM(init_mm);
19struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
20 18
21EXPORT_SYMBOL(init_mm); 19EXPORT_SYMBOL(init_mm);
22 20
diff --git a/arch/h8300/kernel/init_task.c b/arch/h8300/kernel/init_task.c
index ef5755af6e28..19272c2ac56a 100644
--- a/arch/h8300/kernel/init_task.c
+++ b/arch/h8300/kernel/init_task.c
@@ -8,7 +8,6 @@
8#include <linux/init_task.h> 8#include <linux/init_task.h>
9#include <linux/fs.h> 9#include <linux/fs.h>
10#include <linux/mqueue.h> 10#include <linux/mqueue.h>
11#include <linux/nsproxy.h>
12 11
13#include <asm/uaccess.h> 12#include <asm/uaccess.h>
14#include <asm/pgtable.h> 13#include <asm/pgtable.h>
@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES;
18static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 17static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
19static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 18static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
20struct mm_struct init_mm = INIT_MM(init_mm); 19struct mm_struct init_mm = INIT_MM(init_mm);
21struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
22 20
23EXPORT_SYMBOL(init_mm); 21EXPORT_SYMBOL(init_mm);
24 22
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;
16static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 15static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
17static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 16static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
18struct mm_struct init_mm = INIT_MM(init_mm); 17struct mm_struct init_mm = INIT_MM(init_mm);
19struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
20 18
21EXPORT_SYMBOL(init_mm); 19EXPORT_SYMBOL(init_mm);
22 20
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c
index 2d62471bfd02..b69c397ed1bf 100644
--- a/arch/ia64/kernel/init_task.c
+++ b/arch/ia64/kernel/init_task.c
@@ -12,7 +12,6 @@
12#include <linux/sched.h> 12#include <linux/sched.h>
13#include <linux/init_task.h> 13#include <linux/init_task.h>
14#include <linux/mqueue.h> 14#include <linux/mqueue.h>
15#include <linux/nsproxy.h>
16 15
17#include <asm/uaccess.h> 16#include <asm/uaccess.h>
18#include <asm/pgtable.h> 17#include <asm/pgtable.h>
@@ -22,7 +21,6 @@ static struct files_struct init_files = INIT_FILES;
22static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 21static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
23static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 22static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
24struct mm_struct init_mm = INIT_MM(init_mm); 23struct mm_struct init_mm = INIT_MM(init_mm);
25struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
26 24
27EXPORT_SYMBOL(init_mm); 25EXPORT_SYMBOL(init_mm);
28 26
diff --git a/arch/m32r/kernel/init_task.c b/arch/m32r/kernel/init_task.c
index 005747590da6..9e508fd9d970 100644
--- a/arch/m32r/kernel/init_task.c
+++ b/arch/m32r/kernel/init_task.c
@@ -7,7 +7,6 @@
7#include <linux/init_task.h> 7#include <linux/init_task.h>
8#include <linux/fs.h> 8#include <linux/fs.h>
9#include <linux/mqueue.h> 9#include <linux/mqueue.h>
10#include <linux/nsproxy.h>
11 10
12#include <asm/uaccess.h> 11#include <asm/uaccess.h>
13#include <asm/pgtable.h> 12#include <asm/pgtable.h>
@@ -17,7 +16,6 @@ static struct files_struct init_files = INIT_FILES;
17static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 16static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
18static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 17static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
19struct mm_struct init_mm = INIT_MM(init_mm); 18struct mm_struct init_mm = INIT_MM(init_mm);
20struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
21 19
22EXPORT_SYMBOL(init_mm); 20EXPORT_SYMBOL(init_mm);
23 21
diff --git a/arch/m68knommu/kernel/init_task.c b/arch/m68knommu/kernel/init_task.c
index b99fc6d6b7c1..3897043a126a 100644
--- a/arch/m68knommu/kernel/init_task.c
+++ b/arch/m68knommu/kernel/init_task.c
@@ -8,7 +8,6 @@
8#include <linux/init_task.h> 8#include <linux/init_task.h>
9#include <linux/fs.h> 9#include <linux/fs.h>
10#include <linux/mqueue.h> 10#include <linux/mqueue.h>
11#include <linux/nsproxy.h>
12 11
13#include <asm/uaccess.h> 12#include <asm/uaccess.h>
14#include <asm/pgtable.h> 13#include <asm/pgtable.h>
@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES;
18static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 17static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
19static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 18static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
20struct mm_struct init_mm = INIT_MM(init_mm); 19struct mm_struct init_mm = INIT_MM(init_mm);
21struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
22 20
23EXPORT_SYMBOL(init_mm); 21EXPORT_SYMBOL(init_mm);
24 22
diff --git a/arch/mips/kernel/init_task.c b/arch/mips/kernel/init_task.c
index dfe47e6a8b37..aeda7f58391b 100644
--- a/arch/mips/kernel/init_task.c
+++ b/arch/mips/kernel/init_task.c
@@ -4,7 +4,6 @@
4#include <linux/init_task.h> 4#include <linux/init_task.h>
5#include <linux/fs.h> 5#include <linux/fs.h>
6#include <linux/mqueue.h> 6#include <linux/mqueue.h>
7#include <linux/nsproxy.h>
8 7
9#include <asm/thread_info.h> 8#include <asm/thread_info.h>
10#include <asm/uaccess.h> 9#include <asm/uaccess.h>
@@ -15,7 +14,6 @@ static struct files_struct init_files = INIT_FILES;
15static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 14static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
16static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 15static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17struct mm_struct init_mm = INIT_MM(init_mm); 16struct mm_struct init_mm = INIT_MM(init_mm);
18struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
19 17
20EXPORT_SYMBOL(init_mm); 18EXPORT_SYMBOL(init_mm);
21 19
diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c
index c0c43e29973b..8384bf9cecd2 100644
--- a/arch/parisc/kernel/init_task.c
+++ b/arch/parisc/kernel/init_task.c
@@ -28,7 +28,6 @@
28#include <linux/init.h> 28#include <linux/init.h>
29#include <linux/init_task.h> 29#include <linux/init_task.h>
30#include <linux/mqueue.h> 30#include <linux/mqueue.h>
31#include <linux/nsproxy.h>
32 31
33#include <asm/uaccess.h> 32#include <asm/uaccess.h>
34#include <asm/pgtable.h> 33#include <asm/pgtable.h>
@@ -39,7 +38,6 @@ static struct files_struct init_files = INIT_FILES;
39static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 38static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
40static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 39static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
41struct mm_struct init_mm = INIT_MM(init_mm); 40struct mm_struct init_mm = INIT_MM(init_mm);
42struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
43 41
44EXPORT_SYMBOL(init_mm); 42EXPORT_SYMBOL(init_mm);
45 43
diff --git a/arch/powerpc/kernel/init_task.c b/arch/powerpc/kernel/init_task.c
index e24ace618987..941043ae040f 100644
--- a/arch/powerpc/kernel/init_task.c
+++ b/arch/powerpc/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#include <asm/uaccess.h> 8#include <asm/uaccess.h>
10 9
11static struct fs_struct init_fs = INIT_FS; 10static struct fs_struct init_fs = INIT_FS;
@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES;
13static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 12static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
14static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 13static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
15struct mm_struct init_mm = INIT_MM(init_mm); 14struct mm_struct init_mm = INIT_MM(init_mm);
16struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
17 15
18EXPORT_SYMBOL(init_mm); 16EXPORT_SYMBOL(init_mm);
19 17
diff --git a/arch/s390/kernel/init_task.c b/arch/s390/kernel/init_task.c
index 0918921763b1..d73a74013e73 100644
--- a/arch/s390/kernel/init_task.c
+++ b/arch/s390/kernel/init_task.c
@@ -11,7 +11,6 @@
11#include <linux/sched.h> 11#include <linux/sched.h>
12#include <linux/init_task.h> 12#include <linux/init_task.h>
13#include <linux/mqueue.h> 13#include <linux/mqueue.h>
14#include <linux/nsproxy.h>
15 14
16#include <asm/uaccess.h> 15#include <asm/uaccess.h>
17#include <asm/pgtable.h> 16#include <asm/pgtable.h>
@@ -21,7 +20,6 @@ static struct files_struct init_files = INIT_FILES;
21static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 20static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
22static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 21static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
23struct mm_struct init_mm = INIT_MM(init_mm); 22struct mm_struct init_mm = INIT_MM(init_mm);
24struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
25 23
26EXPORT_SYMBOL(init_mm); 24EXPORT_SYMBOL(init_mm);
27 25
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c
index 81caf0fd3bee..44053ea92936 100644
--- a/arch/sh/kernel/init_task.c
+++ b/arch/sh/kernel/init_task.c
@@ -3,7 +3,6 @@
3#include <linux/sched.h> 3#include <linux/sched.h>
4#include <linux/init_task.h> 4#include <linux/init_task.h>
5#include <linux/mqueue.h> 5#include <linux/mqueue.h>
6#include <linux/nsproxy.h>
7 6
8#include <asm/uaccess.h> 7#include <asm/uaccess.h>
9#include <asm/pgtable.h> 8#include <asm/pgtable.h>
@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES;
13static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 12static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
14static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 13static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
15struct mm_struct init_mm = INIT_MM(init_mm); 14struct mm_struct init_mm = INIT_MM(init_mm);
16struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
17 15
18EXPORT_SYMBOL(init_mm); 16EXPORT_SYMBOL(init_mm);
19 17
diff --git a/arch/sh64/kernel/init_task.c b/arch/sh64/kernel/init_task.c
index 0c95f40c5403..de2d07db1f88 100644
--- a/arch/sh64/kernel/init_task.c
+++ b/arch/sh64/kernel/init_task.c
@@ -14,7 +14,6 @@
14#include <linux/sched.h> 14#include <linux/sched.h>
15#include <linux/init_task.h> 15#include <linux/init_task.h>
16#include <linux/mqueue.h> 16#include <linux/mqueue.h>
17#include <linux/nsproxy.h>
18 17
19#include <asm/uaccess.h> 18#include <asm/uaccess.h>
20#include <asm/pgtable.h> 19#include <asm/pgtable.h>
@@ -24,7 +23,6 @@ static struct files_struct init_files = INIT_FILES;
24static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 23static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
25static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 24static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
26struct mm_struct init_mm = INIT_MM(init_mm); 25struct mm_struct init_mm = INIT_MM(init_mm);
27struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
28 26
29struct pt_regs fake_swapper_regs; 27struct pt_regs fake_swapper_regs;
30 28
diff --git a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c
index a73926d5176b..fc31de66b1c2 100644
--- a/arch/sparc/kernel/init_task.c
+++ b/arch/sparc/kernel/init_task.c
@@ -3,7 +3,6 @@
3#include <linux/sched.h> 3#include <linux/sched.h>
4#include <linux/init_task.h> 4#include <linux/init_task.h>
5#include <linux/mqueue.h> 5#include <linux/mqueue.h>
6#include <linux/nsproxy.h>
7 6
8#include <asm/pgtable.h> 7#include <asm/pgtable.h>
9#include <asm/uaccess.h> 8#include <asm/uaccess.h>
@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES;
13static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 12static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
14static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 13static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
15struct mm_struct init_mm = INIT_MM(init_mm); 14struct mm_struct init_mm = INIT_MM(init_mm);
16struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
17struct task_struct init_task = INIT_TASK(init_task); 15struct task_struct init_task = INIT_TASK(init_task);
18 16
19EXPORT_SYMBOL(init_mm); 17EXPORT_SYMBOL(init_mm);
diff --git a/arch/sparc64/kernel/init_task.c b/arch/sparc64/kernel/init_task.c
index f1e9a4b021ae..329b38fa5c89 100644
--- a/arch/sparc64/kernel/init_task.c
+++ b/arch/sparc64/kernel/init_task.c
@@ -3,7 +3,6 @@
3#include <linux/sched.h> 3#include <linux/sched.h>
4#include <linux/init_task.h> 4#include <linux/init_task.h>
5#include <linux/mqueue.h> 5#include <linux/mqueue.h>
6#include <linux/nsproxy.h>
7 6
8#include <asm/pgtable.h> 7#include <asm/pgtable.h>
9#include <asm/uaccess.h> 8#include <asm/uaccess.h>
@@ -14,7 +13,6 @@ static struct files_struct init_files = INIT_FILES;
14static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 13static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
15static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 14static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
16struct mm_struct init_mm = INIT_MM(init_mm); 15struct mm_struct init_mm = INIT_MM(init_mm);
17struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
18 16
19EXPORT_SYMBOL(init_mm); 17EXPORT_SYMBOL(init_mm);
20 18
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
19static struct fs_struct init_fs = INIT_FS; 18static struct fs_struct init_fs = INIT_FS;
20struct mm_struct init_mm = INIT_MM(init_mm); 19struct mm_struct init_mm = INIT_MM(init_mm);
21struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
22static struct files_struct init_files = INIT_FILES; 20static struct files_struct init_files = INIT_FILES;
23static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 21static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
24static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 22static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
diff --git a/arch/v850/kernel/init_task.c b/arch/v850/kernel/init_task.c
index 9d2de7590849..ed2f93cf7c66 100644
--- a/arch/v850/kernel/init_task.c
+++ b/arch/v850/kernel/init_task.c
@@ -16,7 +16,6 @@
16#include <linux/init_task.h> 16#include <linux/init_task.h>
17#include <linux/fs.h> 17#include <linux/fs.h>
18#include <linux/mqueue.h> 18#include <linux/mqueue.h>
19#include <linux/nsproxy.h>
20 19
21#include <asm/uaccess.h> 20#include <asm/uaccess.h>
22#include <asm/pgtable.h> 21#include <asm/pgtable.h>
@@ -26,7 +25,6 @@ static struct files_struct init_files = INIT_FILES;
26static struct signal_struct init_signals = INIT_SIGNALS (init_signals); 25static struct signal_struct init_signals = INIT_SIGNALS (init_signals);
27static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 26static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
28struct mm_struct init_mm = INIT_MM (init_mm); 27struct mm_struct init_mm = INIT_MM (init_mm);
29struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
30 28
31EXPORT_SYMBOL(init_mm); 29EXPORT_SYMBOL(init_mm);
32 30
diff --git a/arch/x86_64/kernel/init_task.c b/arch/x86_64/kernel/init_task.c
index 879728bff73f..3dc5854ba21e 100644
--- a/arch/x86_64/kernel/init_task.c
+++ b/arch/x86_64/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;
16static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 15static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
17static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 16static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
18struct mm_struct init_mm = INIT_MM(init_mm); 17struct mm_struct init_mm = INIT_MM(init_mm);
19struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
20 18
21EXPORT_SYMBOL(init_mm); 19EXPORT_SYMBOL(init_mm);
22 20
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index ad9508865473..a3612f82f187 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -12,6 +12,9 @@
12#include <linux/module.h> 12#include <linux/module.h>
13#include <linux/version.h> 13#include <linux/version.h>
14#include <linux/nsproxy.h> 14#include <linux/nsproxy.h>
15#include <linux/init_task.h>
16
17struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
15 18
16static inline void get_nsproxy(struct nsproxy *ns) 19static inline void get_nsproxy(struct nsproxy *ns)
17{ 20{
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-24 20:37:22 -0500