aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4588b2cf2ecb..cfc5295f1e82 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -80,7 +80,6 @@ extern int pid_max_min, pid_max_max;
80extern int sysctl_drop_caches; 80extern int sysctl_drop_caches;
81extern int percpu_pagelist_fraction; 81extern int percpu_pagelist_fraction;
82extern int compat_log; 82extern int compat_log;
83extern int maps_protect;
84extern int latencytop_enabled; 83extern int latencytop_enabled;
85extern int sysctl_nr_open_min, sysctl_nr_open_max; 84extern int sysctl_nr_open_min, sysctl_nr_open_max;
86#ifdef CONFIG_RCU_TORTURE_TEST 85#ifdef CONFIG_RCU_TORTURE_TEST
@@ -118,10 +117,8 @@ extern char modprobe_path[];
118extern int sg_big_buff; 117extern int sg_big_buff;
119#endif 118#endif
120 119
121#ifdef __sparc__ 120#ifdef CONFIG_SPARC
122extern char reboot_command []; 121#include <asm/system.h>
123extern int stop_a_enabled;
124extern int scons_pwroff;
125#endif 122#endif
126 123
127#ifdef __hppa__ 124#ifdef __hppa__
@@ -415,7 +412,7 @@ static struct ctl_table kern_table[] = {
415 .mode = 0644, 412 .mode = 0644,
416 .proc_handler = &proc_dointvec, 413 .proc_handler = &proc_dointvec,
417 }, 414 },
418#ifdef __sparc__ 415#ifdef CONFIG_SPARC
419 { 416 {
420 .ctl_name = KERN_SPARC_REBOOT, 417 .ctl_name = KERN_SPARC_REBOOT,
421 .procname = "reboot-cmd", 418 .procname = "reboot-cmd",
@@ -810,16 +807,6 @@ static struct ctl_table kern_table[] = {
810 .proc_handler = &proc_dointvec, 807 .proc_handler = &proc_dointvec,
811 }, 808 },
812#endif 809#endif
813#ifdef CONFIG_PROC_FS
814 {
815 .ctl_name = CTL_UNNUMBERED,
816 .procname = "maps_protect",
817 .data = &maps_protect,
818 .maxlen = sizeof(int),
819 .mode = 0644,
820 .proc_handler = &proc_dointvec,
821 },
822#endif
823 { 810 {
824 .ctl_name = CTL_UNNUMBERED, 811 .ctl_name = CTL_UNNUMBERED,
825 .procname = "poweroff_cmd", 812 .procname = "poweroff_cmd",