1 files changed, 21 insertions, 1 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 3d56fe7570da..0b627d9c93d8 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -487,6 +487,26 @@ static struct ctl_table kern_table[] = {
                 .proc_handler   = &ftrace_enable_sysctl,
         },
 #endif
+#ifdef CONFIG_STACK_TRACER
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "stack_tracer_enabled",
+                .data           = &stack_tracer_enabled,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &stack_trace_sysctl,
+        },
+#endif
+#ifdef CONFIG_TRACING
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "ftrace_dump_on_oops",
+                .data           = &ftrace_dump_on_oops,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
+#endif
 #ifdef CONFIG_MODULES
         {
                 .ctl_name       = KERN_MODPROBE,
@@ -1651,7 +1671,7 @@ out:
 
 static int test_perm(int mode, int op)
 {
-        if (!current->euid)
+        if (!current_euid())
                 mode >>= 6;
         else if (in_egroup_p(0))
                 mode >>= 3;