diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 12:16:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 12:16:18 -0500 |
commit | a65981109f294ba7e64b33ad3b4575a4636fce66 (patch) | |
tree | 1061a49f11544e18775630938a8bc53920fa0421 /kernel/sysctl.c | |
parent | 3fed6ae4b027f9c93be18520f87bd06bdffd196b (diff) | |
parent | b685a7350ae76bc0f388e24b36d06a63776c68ee (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
- procfs updates
- various misc bits
- lib/ updates
- epoll updates
- autofs
- fatfs
- a few more MM bits
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (58 commits)
mm/page_io.c: fix polled swap page in
checkpatch: add Co-developed-by to signature tags
docs: fix Co-Developed-by docs
drivers/base/platform.c: kmemleak ignore a known leak
fs: don't open code lru_to_page()
fs/: remove caller signal_pending branch predictions
mm/: remove caller signal_pending branch predictions
arch/arc/mm/fault.c: remove caller signal_pending_branch predictions
kernel/sched/: remove caller signal_pending branch predictions
kernel/locking/mutex.c: remove caller signal_pending branch predictions
mm: select HAVE_MOVE_PMD on x86 for faster mremap
mm: speed up mremap by 20x on large regions
mm: treewide: remove unused address argument from pte_alloc functions
initramfs: cleanup incomplete rootfs
scripts/gdb: fix lx-version string output
kernel/kcov.c: mark write_comp_data() as notrace
kernel/sysctl: add panic_print into sysctl
panic: add options to print system info when panic happens
bfs: extra sanity checking and static inode bitmap
exec: separate MM_ANONPAGES and RLIMIT_STACK accounting
...
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 1825f712e73b..ba4d9e85feb8 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -807,6 +807,13 @@ static struct ctl_table kern_table[] = { | |||
807 | .mode = 0644, | 807 | .mode = 0644, |
808 | .proc_handler = proc_dointvec, | 808 | .proc_handler = proc_dointvec, |
809 | }, | 809 | }, |
810 | { | ||
811 | .procname = "panic_print", | ||
812 | .data = &panic_print, | ||
813 | .maxlen = sizeof(unsigned long), | ||
814 | .mode = 0644, | ||
815 | .proc_handler = proc_doulongvec_minmax, | ||
816 | }, | ||
810 | #if defined CONFIG_PRINTK | 817 | #if defined CONFIG_PRINTK |
811 | { | 818 | { |
812 | .procname = "printk", | 819 | .procname = "printk", |
@@ -2787,6 +2794,8 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int | |||
2787 | bool neg; | 2794 | bool neg; |
2788 | 2795 | ||
2789 | left -= proc_skip_spaces(&p); | 2796 | left -= proc_skip_spaces(&p); |
2797 | if (!left) | ||
2798 | break; | ||
2790 | 2799 | ||
2791 | err = proc_get_long(&p, &left, &val, &neg, | 2800 | err = proc_get_long(&p, &left, &val, &neg, |
2792 | proc_wspace_sep, | 2801 | proc_wspace_sep, |