From e98cd1259ef83779cedf3aa0176ea07d6d86280b Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Tue, 21 Jul 2015 15:17:26 -0700 Subject: Fix incorrect conflict resolution in "vfs: Add setns support for the mount namespace" --- fs/proc/namespaces.c | 3 --- include/linux/proc_fs.h | 1 - 2 files changed, 4 deletions(-) diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index 70a62c0..05051ef 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -25,9 +25,6 @@ static const struct proc_ns_operations *ns_entries[] = { #ifdef CONFIG_IPC_NS &ipcns_operations, #endif -#ifdef CONFIG_PID_NS - &pidns_operations, -#endif &mntns_operations, }; diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 3accff7..06e4539 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -272,7 +272,6 @@ struct proc_ns_operations { extern const struct proc_ns_operations netns_operations; extern const struct proc_ns_operations utsns_operations; extern const struct proc_ns_operations ipcns_operations; -extern const struct proc_ns_operations pidns_operations; extern const struct proc_ns_operations mntns_operations; union proc_op { -- cgit v1.1