Move sysctl_panic_on_rcu_stall and sysctl_max_rcu_stall_to_panic into the kernel/rcu subdirectory. Make these static in tree_stall.h and removed them as extern from panic.h as their scope is now confined into one file. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kernel/sysctl.c.
Showing the changes to kernel/sysctl.c (1 of 3 files). Show all
Unified · Split
| @@ -1706,26 +1706,6 @@ static const struct ctl_table kern_table[] = { · 1705 unmodified lines | |||
| 1706 | .proc_handler = proc_dointvec, | 1706 | .proc_handler = proc_dointvec, |
| 1707 | }, | 1707 | }, |
| 1708 | #endif | 1708 | #endif |
| 1709 | #ifdef CONFIG_TREE_RCU | ||
| 1710 | { | ||
| 1711 | .procname = "panic_on_rcu_stall", | ||
| 1712 | .data = &sysctl_panic_on_rcu_stall, | ||
| 1713 | .maxlen = sizeof(sysctl_panic_on_rcu_stall), | ||
| 1714 | .mode = 0644, | ||
| 1715 | .proc_handler = proc_dointvec_minmax, | ||
| 1716 | .extra1 = SYSCTL_ZERO, | ||
| 1717 | .extra2 = SYSCTL_ONE, | ||
| 1718 | }, | ||
| 1719 | { | ||
| 1720 | .procname = "max_rcu_stall_to_panic", | ||
| 1721 | .data = &sysctl_max_rcu_stall_to_panic, | ||
| 1722 | .maxlen = sizeof(sysctl_max_rcu_stall_to_panic), | ||
| 1723 | .mode = 0644, | ||
| 1724 | .proc_handler = proc_dointvec_minmax, | ||
| 1725 | .extra1 = SYSCTL_ONE, | ||
| 1726 | .extra2 = SYSCTL_INT_MAX, | ||
| 1727 | }, | ||
| 1728 | #endif | ||
| 1729 | }; | 1709 | }; |
| 1730 | 1710 | ||
| 1731 | int __init sysctl_init_bases(void) | 1711 | int __init sysctl_init_bases(void) |