diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index d93e13d93f24..7dca326648d5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -61,6 +61,7 @@ extern int proc_nr_files(ctl_table *table, int write, struct file *filp, | |||
61 | 61 | ||
62 | /* External variables not in a header file. */ | 62 | /* External variables not in a header file. */ |
63 | extern int C_A_D; | 63 | extern int C_A_D; |
64 | extern int print_fatal_signals; | ||
64 | extern int sysctl_overcommit_memory; | 65 | extern int sysctl_overcommit_memory; |
65 | extern int sysctl_overcommit_ratio; | 66 | extern int sysctl_overcommit_ratio; |
66 | extern int sysctl_panic_on_oom; | 67 | extern int sysctl_panic_on_oom; |
@@ -202,7 +203,10 @@ static ctl_table root_table[] = { | |||
202 | .mode = 0555, | 203 | .mode = 0555, |
203 | .child = dev_table, | 204 | .child = dev_table, |
204 | }, | 205 | }, |
205 | 206 | /* | |
207 | * NOTE: do not add new entries to this table unless you have read | ||
208 | * Documentation/sysctl/ctl_unnumbered.txt | ||
209 | */ | ||
206 | { .ctl_name = 0 } | 210 | { .ctl_name = 0 } |
207 | }; | 211 | }; |
208 | 212 | ||
@@ -340,6 +344,14 @@ static ctl_table kern_table[] = { | |||
340 | .proc_handler = &proc_dointvec, | 344 | .proc_handler = &proc_dointvec, |
341 | }, | 345 | }, |
342 | #endif | 346 | #endif |
347 | { | ||
348 | .ctl_name = CTL_UNNUMBERED, | ||
349 | .procname = "print-fatal-signals", | ||
350 | .data = &print_fatal_signals, | ||
351 | .maxlen = sizeof(int), | ||
352 | .mode = 0644, | ||
353 | .proc_handler = &proc_dointvec, | ||
354 | }, | ||
343 | #ifdef __sparc__ | 355 | #ifdef __sparc__ |
344 | { | 356 | { |
345 | .ctl_name = KERN_SPARC_REBOOT, | 357 | .ctl_name = KERN_SPARC_REBOOT, |
@@ -958,6 +970,17 @@ static ctl_table vm_table[] = { | |||
958 | .mode = 0644, | 970 | .mode = 0644, |
959 | .proc_handler = &proc_doulongvec_minmax, | 971 | .proc_handler = &proc_doulongvec_minmax, |
960 | }, | 972 | }, |
973 | #ifdef CONFIG_NUMA | ||
974 | { | ||
975 | .ctl_name = CTL_UNNUMBERED, | ||
976 | .procname = "numa_zonelist_order", | ||
977 | .data = &numa_zonelist_order, | ||
978 | .maxlen = NUMA_ZONELIST_ORDER_LEN, | ||
979 | .mode = 0644, | ||
980 | .proc_handler = &numa_zonelist_order_handler, | ||
981 | .strategy = &sysctl_string, | ||
982 | }, | ||
983 | #endif | ||
961 | #endif | 984 | #endif |
962 | #if defined(CONFIG_X86_32) || \ | 985 | #if defined(CONFIG_X86_32) || \ |
963 | (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) | 986 | (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) |
@@ -972,6 +995,14 @@ static ctl_table vm_table[] = { | |||
972 | .extra1 = &zero, | 995 | .extra1 = &zero, |
973 | }, | 996 | }, |
974 | #endif | 997 | #endif |
998 | /* | ||
999 | * NOTE: do not add new entries to this table unless you have read | ||
1000 | * Documentation/sysctl/ctl_unnumbered.txt | ||
1001 | */ | ||
1002 | /* | ||
1003 | * NOTE: do not add new entries to this table unless you have read | ||
1004 | * Documentation/sysctl/ctl_unnumbered.txt | ||
1005 | */ | ||
975 | { .ctl_name = 0 } | 1006 | { .ctl_name = 0 } |
976 | }; | 1007 | }; |
977 | 1008 | ||
@@ -1112,6 +1143,14 @@ static ctl_table fs_table[] = { | |||
1112 | .child = binfmt_misc_table, | 1143 | .child = binfmt_misc_table, |
1113 | }, | 1144 | }, |
1114 | #endif | 1145 | #endif |
1146 | /* | ||
1147 | * NOTE: do not add new entries to this table unless you have read | ||
1148 | * Documentation/sysctl/ctl_unnumbered.txt | ||
1149 | */ | ||
1150 | /* | ||
1151 | * NOTE: do not add new entries to this table unless you have read | ||
1152 | * Documentation/sysctl/ctl_unnumbered.txt | ||
1153 | */ | ||
1115 | { .ctl_name = 0 } | 1154 | { .ctl_name = 0 } |
1116 | }; | 1155 | }; |
1117 | 1156 | ||