Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/alpha/kernel/init_task.c

+0 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/init_task.h>

#include <linux/fs.h>

#include <linux/mqueue.h>

#include <linux/nsproxy.h>

#include <asm/uaccess.h>
@@ -14,7 +13,6 @@ static struct files_struct init_files = INIT_FILES; 
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

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);



EXPORT_SYMBOL(init_mm);

arch/arm/kernel/init_task.c

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/init.h>

#include <linux/init_task.h>

#include <linux/mqueue.h>

#include <linux/nsproxy.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES; 
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

struct mm_struct init_mm = INIT_MM(init_mm);

struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);



EXPORT_SYMBOL(init_mm);

arch/arm26/kernel/init_task.c

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/init.h>

#include <linux/init_task.h>

#include <linux/mqueue.h>

#include <linux/nsproxy.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -21,7 +20,6 @@ static struct files_struct init_files = INIT_FILES; 
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

struct mm_struct init_mm = INIT_MM(init_mm);

struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);



EXPORT_SYMBOL(init_mm);

arch/frv/kernel/init_task.c

+0 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/init_task.h>

#include <linux/fs.h>

#include <linux/mqueue.h>

#include <linux/nsproxy.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -16,7 +15,6 @@ static struct files_struct init_files = INIT_FILES; 
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

struct mm_struct init_mm = INIT_MM(init_mm);

struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);



EXPORT_SYMBOL(init_mm);

arch/h8300/kernel/init_task.c

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/init_task.h>

#include <linux/fs.h>

#include <linux/mqueue.h>

#include <linux/nsproxy.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -18,7 +17,6 @@ static struct files_struct init_files = INIT_FILES; 
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

struct mm_struct init_mm = INIT_MM(init_mm);

struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);



EXPORT_SYMBOL(init_mm);