1 files changed, 29 insertions, 13 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 5e2ad5bf88e2..d41ef6b4cf72 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -37,7 +37,6 @@
 #include <linux/highuid.h>
 #include <linux/writeback.h>
 #include <linux/hugetlb.h>
-#include <linux/security.h>
 #include <linux/initrd.h>
 #include <linux/times.h>
 #include <linux/limits.h>
@@ -67,14 +66,13 @@ extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
 extern int sysctl_panic_on_oom;
 extern int sysctl_oom_kill_allocating_task;
+extern int sysctl_oom_dump_tasks;
 extern int max_threads;
 extern int core_uses_pid;
 extern int suid_dumpable;
 extern char core_pattern[];
 extern int pid_max;
 extern int min_free_kbytes;
-extern int printk_ratelimit_jiffies;
-extern int printk_ratelimit_burst;
 extern int pid_max_min, pid_max_max;
 extern int sysctl_drop_caches;
 extern int percpu_pagelist_fraction;
@@ -490,14 +488,6 @@ static struct ctl_table kern_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },
-        {
-                .ctl_name       = KERN_PRINTK,
-                .procname       = "printk",
-                .data           = &console_loglevel,
-                .maxlen         = 4*sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-        },
 #ifdef CONFIG_KMOD
         {
                 .ctl_name       = KERN_MODPROBE,
@@ -644,6 +634,15 @@ static struct ctl_table kern_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },
+#if defined CONFIG_PRINTK
+        {
+                .ctl_name       = KERN_PRINTK,
+                .procname       = "printk",
+                .data           = &console_loglevel,
+                .maxlen         = 4*sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
         {
                 .ctl_name       = KERN_PRINTK_RATELIMIT,
                 .procname       = "printk_ratelimit",
@@ -661,6 +660,7 @@ static struct ctl_table kern_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },
+#endif
         {
                 .ctl_name       = KERN_NGROUPS_MAX,
                 .procname       = "ngroups_max",
@@ -871,6 +871,14 @@ static struct ctl_table vm_table[] = {
                 .proc_handler   = &proc_dointvec,
         },
         {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "oom_dump_tasks",
+                .data           = &sysctl_oom_dump_tasks,
+                .maxlen         = sizeof(sysctl_oom_dump_tasks),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
+        {
                 .ctl_name       = VM_OVERCOMMIT_RATIO,
                 .procname       = "overcommit_ratio",
                 .data           = &sysctl_overcommit_ratio,
@@ -973,7 +981,7 @@ static struct ctl_table vm_table[] = {
                 .data           = &nr_overcommit_huge_pages,
                 .maxlen         = sizeof(nr_overcommit_huge_pages),
                 .mode           = 0644,
-                .proc_handler   = &proc_doulongvec_minmax,
+                .proc_handler   = &hugetlb_overcommit_handler,
         },
 #endif
         {
@@ -1203,6 +1211,14 @@ static struct ctl_table fs_table[] = {
                 .proc_handler   = &proc_dointvec,
         },
         {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "nr_open",
+                .data           = &sysctl_nr_open,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
+        {
                 .ctl_name       = FS_DENTRY,
                 .procname       = "dentry-state",
                 .data           = &dentry_stat,
@@ -2471,7 +2487,7 @@ static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp
         pid_t tmp;
         int r;
 
-        tmp = pid_nr_ns(cad_pid, current->nsproxy->pid_ns);
+        tmp = pid_vnr(cad_pid);
 
         r = __do_proc_dointvec(&tmp, table, write, filp, buffer,
                                lenp, ppos, NULL, NULL);