diff options
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ab462b9968d5..98e02328c67d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -335,7 +335,10 @@ static struct ctl_table kern_table[] = { | |||
| 335 | .data = &sysctl_timer_migration, | 335 | .data = &sysctl_timer_migration, |
| 336 | .maxlen = sizeof(unsigned int), | 336 | .maxlen = sizeof(unsigned int), |
| 337 | .mode = 0644, | 337 | .mode = 0644, |
| 338 | .proc_handler = &proc_dointvec, | 338 | .proc_handler = &proc_dointvec_minmax, |
| 339 | .strategy = &sysctl_intvec, | ||
| 340 | .extra1 = &zero, | ||
| 341 | .extra2 = &one, | ||
| 339 | }, | 342 | }, |
| 340 | #endif | 343 | #endif |
| 341 | { | 344 | { |
| @@ -744,6 +747,14 @@ static struct ctl_table kern_table[] = { | |||
| 744 | .proc_handler = &proc_dointvec, | 747 | .proc_handler = &proc_dointvec, |
| 745 | }, | 748 | }, |
| 746 | { | 749 | { |
| 750 | .ctl_name = CTL_UNNUMBERED, | ||
| 751 | .procname = "panic_on_io_nmi", | ||
| 752 | .data = &panic_on_io_nmi, | ||
| 753 | .maxlen = sizeof(int), | ||
| 754 | .mode = 0644, | ||
| 755 | .proc_handler = &proc_dointvec, | ||
| 756 | }, | ||
| 757 | { | ||
| 747 | .ctl_name = KERN_BOOTLOADER_TYPE, | 758 | .ctl_name = KERN_BOOTLOADER_TYPE, |
| 748 | .procname = "bootloader_type", | 759 | .procname = "bootloader_type", |
| 749 | .data = &bootloader_type, | 760 | .data = &bootloader_type, |
| @@ -2283,7 +2294,7 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table, | |||
| 2283 | void *data) | 2294 | void *data) |
| 2284 | { | 2295 | { |
| 2285 | #define TMPBUFLEN 21 | 2296 | #define TMPBUFLEN 21 |
| 2286 | int *i, vleft, first=1, neg, val; | 2297 | int *i, vleft, first = 1, neg; |
| 2287 | unsigned long lval; | 2298 | unsigned long lval; |
| 2288 | size_t left, len; | 2299 | size_t left, len; |
| 2289 | 2300 | ||
| @@ -2336,8 +2347,6 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table, | |||
| 2336 | len = p-buf; | 2347 | len = p-buf; |
| 2337 | if ((len < left) && *p && !isspace(*p)) | 2348 | if ((len < left) && *p && !isspace(*p)) |
| 2338 | break; | 2349 | break; |
| 2339 | if (neg) | ||
| 2340 | val = -val; | ||
| 2341 | s += len; | 2350 | s += len; |
| 2342 | left -= len; | 2351 | left -= len; |
| 2343 | 2352 | ||
