diff options
| author | Daniel Rosenberg <drosen@google.com> | 2015-07-21 15:17:26 -0700 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-04-03 14:55:58 +0200 |
| commit | e98cd1259ef83779cedf3aa0176ea07d6d86280b (patch) | |
| tree | 41abde36483f41b0b901ad4059a3ee90d6e84e1b | |
| parent | f83034bcc137f14e8d7f707c1514891be493ba95 (diff) | |
| download | kernel_samsung_tuna-e98cd1259ef83779cedf3aa0176ea07d6d86280b.zip kernel_samsung_tuna-e98cd1259ef83779cedf3aa0176ea07d6d86280b.tar.gz kernel_samsung_tuna-e98cd1259ef83779cedf3aa0176ea07d6d86280b.tar.bz2 | |
Fix incorrect conflict resolution in "vfs: Add setns support for the mount namespace"
| -rw-r--r-- | fs/proc/namespaces.c | 3 | ||||
| -rw-r--r-- | include/linux/proc_fs.h | 1 |
2 files changed, 0 insertions, 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 { |