From: "Serge E. Hallyn" 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 Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton --- arch/alpha/kernel/init_task.c | 2 -- arch/arm/kernel/init_task.c | 2 -- arch/arm26/kernel/init_task.c | 2 -- arch/frv/kernel/init_task.c | 2 -- arch/h8300/kernel/init_task.c | 2 -- arch/i386/kernel/init_task.c | 2 -- arch/ia64/kernel/init_task.c | 2 -- arch/m32r/kernel/init_task.c | 2 -- arch/m68knommu/kernel/init_task.c | 2 -- arch/mips/kernel/init_task.c | 2 -- arch/parisc/kernel/init_task.c | 2 -- arch/powerpc/kernel/init_task.c | 2 -- arch/s390/kernel/init_task.c | 2 -- arch/sh/kernel/init_task.c | 2 -- arch/sh64/kernel/init_task.c | 2 -- arch/sparc/kernel/init_task.c | 2 -- arch/sparc64/kernel/init_task.c | 2 -- arch/um/kernel/init_task.c | 2 -- arch/v850/kernel/init_task.c | 2 -- arch/x86_64/kernel/init_task.c | 2 -- kernel/nsproxy.c | 3 +++ 21 files changed, 3 insertions(+), 40 deletions(-) diff -puN arch/alpha/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/alpha/kernel/init_task.c --- a/arch/alpha/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/alpha/kernel/init_task.c @@ -5,7 +5,6 @@ #include #include #include -#include #include @@ -14,7 +13,6 @@ static struct files_struct 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); diff -puN arch/arm/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/arm/kernel/init_task.c --- a/arch/arm/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/arm/kernel/init_task.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -18,7 +17,6 @@ static struct files_struct 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); diff -puN arch/arm26/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/arm26/kernel/init_task.c --- a/arch/arm26/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/arm26/kernel/init_task.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -21,7 +20,6 @@ static struct files_struct 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); diff -puN arch/frv/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/frv/kernel/init_task.c --- a/arch/frv/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/frv/kernel/init_task.c @@ -5,7 +5,6 @@ #include #include #include -#include #include #include @@ -16,7 +15,6 @@ static struct files_struct 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); diff -puN arch/h8300/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/h8300/kernel/init_task.c --- a/arch/h8300/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/h8300/kernel/init_task.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -18,7 +17,6 @@ static struct files_struct 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); diff -puN arch/i386/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/i386/kernel/init_task.c --- a/arch/i386/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/i386/kernel/init_task.c @@ -5,7 +5,6 @@ #include #include #include -#include #include #include @@ -16,7 +15,6 @@ static struct files_struct 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); diff -puN arch/ia64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/ia64/kernel/init_task.c --- a/arch/ia64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/ia64/kernel/init_task.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -22,7 +21,6 @@ static struct files_struct 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); diff -puN arch/m32r/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/m32r/kernel/init_task.c --- a/arch/m32r/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/m32r/kernel/init_task.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include @@ -17,7 +16,6 @@ static struct files_struct 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); diff -puN arch/m68knommu/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/m68knommu/kernel/init_task.c --- a/arch/m68knommu/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/m68knommu/kernel/init_task.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -18,7 +17,6 @@ static struct files_struct 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); diff -puN arch/mips/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/mips/kernel/init_task.c --- a/arch/mips/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/mips/kernel/init_task.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -15,7 +14,6 @@ static struct files_struct 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); diff -puN arch/parisc/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/parisc/kernel/init_task.c --- a/arch/parisc/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/parisc/kernel/init_task.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -39,7 +38,6 @@ static struct files_struct 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); diff -puN arch/powerpc/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/powerpc/kernel/init_task.c --- a/arch/powerpc/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/powerpc/kernel/init_task.c @@ -5,7 +5,6 @@ #include #include #include -#include #include static struct fs_struct init_fs = INIT_FS; @@ -13,7 +12,6 @@ static struct files_struct 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); diff -puN arch/s390/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/s390/kernel/init_task.c --- a/arch/s390/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/s390/kernel/init_task.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -21,7 +20,6 @@ static struct files_struct 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); diff -puN arch/sh/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/sh/kernel/init_task.c --- a/arch/sh/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/sh/kernel/init_task.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -13,7 +12,6 @@ static struct files_struct 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); diff -puN arch/sh64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/sh64/kernel/init_task.c --- a/arch/sh64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/sh64/kernel/init_task.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -24,7 +23,6 @@ static struct files_struct 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 pt_regs fake_swapper_regs; diff -puN arch/sparc/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/sparc/kernel/init_task.c --- a/arch/sparc/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/sparc/kernel/init_task.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -13,7 +12,6 @@ static struct files_struct 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); diff -puN arch/sparc64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/sparc64/kernel/init_task.c --- a/arch/sparc64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/sparc64/kernel/init_task.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -14,7 +13,6 @@ static struct files_struct 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); diff -puN arch/um/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/um/kernel/init_task.c --- a/arch/um/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/um/kernel/init_task.c @@ -9,7 +9,6 @@ #include "linux/sched.h" #include "linux/init_task.h" #include "linux/mqueue.h" -#include "linux/nsproxy.h" #include "asm/uaccess.h" #include "asm/pgtable.h" #include "user_util.h" @@ -18,7 +17,6 @@ static struct fs_struct init_fs = INIT_FS; 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 signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); diff -puN arch/v850/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/v850/kernel/init_task.c --- a/arch/v850/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/v850/kernel/init_task.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include @@ -26,7 +25,6 @@ static struct files_struct 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); diff -puN arch/x86_64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc arch/x86_64/kernel/init_task.c --- a/arch/x86_64/kernel/init_task.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/arch/x86_64/kernel/init_task.c @@ -5,7 +5,6 @@ #include #include #include -#include #include #include @@ -16,7 +15,6 @@ static struct files_struct 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); diff -puN kernel/nsproxy.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc kernel/nsproxy.c --- a/kernel/nsproxy.c~namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc +++ a/kernel/nsproxy.c @@ -12,6 +12,9 @@ #include #include #include +#include + +struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy); static inline void get_nsproxy(struct nsproxy *ns) { _