Skip to content

L
linux
Commit 0437eb59 authored by Serge E. Hallyn's avatar Serge E. Hallyn Committed by Linus Torvalds
Browse files
Options

[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: default avatarSerge 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ab516013
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 40 deletions
arch/alpha/kernel/init_task.c
View file @ 0437eb59
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -14,7 +13,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -14,7 +13,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
struct task_struct init_task = INIT_TASK(init_task); struct task_struct init_task = INIT_TASK(init_task);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/arm/kernel/init_task.c
View file @ 0437eb59
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/arm26/kernel/init_task.c
View file @ 0437eb59
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -21,7 +20,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -21,7 +20,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/frv/kernel/init_task.c
View file @ 0437eb59
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/h8300/kernel/init_task.c
View file @ 0437eb59
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/i386/kernel/init_task.c
View file @ 0437eb59
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/ia64/kernel/init_task.c
View file @ 0437eb59
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -22,7 +21,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -22,7 +21,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/m32r/kernel/init_task.c
View file @ 0437eb59
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -17,7 +16,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -17,7 +16,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/m68knommu/kernel/init_task.c
View file @ 0437eb59
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/mips/kernel/init_task.c
View file @ 0437eb59
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -15,7 +14,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -15,7 +14,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/parisc/kernel/init_task.c
View file @ 0437eb59
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -39,7 +38,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -39,7 +38,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/powerpc/kernel/init_task.c
View file @ 0437eb59
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
static struct fs_struct init_fs = INIT_FS; static struct fs_struct init_fs = INIT_FS;
...@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/s390/kernel/init_task.c
View file @ 0437eb59
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -21,7 +20,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -21,7 +20,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/sh/kernel/init_task.c
View file @ 0437eb59
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/sh64/kernel/init_task.c
View file @ 0437eb59
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -24,7 +23,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -24,7 +23,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
struct pt_regs fake_swapper_regs; struct pt_regs fake_swapper_regs;
......
arch/sparc/kernel/init_task.c
View file @ 0437eb59
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -13,7 +12,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
struct task_struct init_task = INIT_TASK(init_task); struct task_struct init_task = INIT_TASK(init_task);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/sparc64/kernel/init_task.c
View file @ 0437eb59
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -14,7 +13,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -14,7 +13,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/um/kernel/init_task.c
View file @ 0437eb59
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "linux/sched.h" #include "linux/sched.h"
#include "linux/init_task.h" #include "linux/init_task.h"
#include "linux/mqueue.h" #include "linux/mqueue.h"
#include "linux/nsproxy.h"
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "asm/pgtable.h" #include "asm/pgtable.h"
#include "user_util.h" #include "user_util.h"
...@@ -18,7 +17,6 @@ ...@@ -18,7 +17,6 @@
static struct fs_struct init_fs = INIT_FS; static struct fs_struct init_fs = INIT_FS;
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
static struct files_struct init_files = INIT_FILES; static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
......
arch/v850/kernel/init_task.c
View file @ 0437eb59
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -26,7 +25,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -26,7 +25,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS (init_signals); static struct signal_struct init_signals = INIT_SIGNALS (init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM (init_mm); struct mm_struct init_mm = INIT_MM (init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
arch/x86_64/kernel/init_task.c
View file @ 0437eb59
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES; ...@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm); struct mm_struct init_mm = INIT_MM(init_mm);
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
EXPORT_SYMBOL(init_mm); EXPORT_SYMBOL(init_mm);
......
kernel/nsproxy.c
View file @ 0437eb59
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <linux/init_task.h>
struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
static inline void get_nsproxy(struct nsproxy *ns) static inline void get_nsproxy(struct nsproxy *ns)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7