Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390: Move s390 sysctls into their own file under arch/s390 

Move s390 sysctls (spin_retry and userprocess_debug) into their own
files under arch/s390. Create two new sysctl tables
(2390_{fault,spin}_sysctl_table) which will be initialized with
arch_initcall placing them after their original place in proc_root_init.

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.

Signed-off-by: joel granados <joel.granados@kernel.org>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20250306-jag-mv_ctltables-v2-6-71b243c8d3f8@kernel.org
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
joel granados 2025-03-06 12:29:46 +01:00 committed by Vasily Gorbik
parent 5983ab1684
commit 20de8f8d31
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/s390/lib/spinlock.c
View File

@ -10,6 +10,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/sysctl.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/percpu.h> #include <linux/percpu.h>
@ -38,6 +39,23 @@ static int __init spin_retry_setup(char *str)
} }
__setup("spin_retry=", spin_retry_setup); __setup("spin_retry=", spin_retry_setup);
static const struct ctl_table s390_spin_sysctl_table[] = {
{
.procname = "spin_retry",
.data = &spin_retry,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
};
static int __init init_s390_spin_sysctls(void)
{
register_sysctl_init("kernel", s390_spin_sysctl_table);
return 0;
}
arch_initcall(init_s390_spin_sysctls);
struct spin_wait { struct spin_wait {
struct spin_wait *next, *prev; struct spin_wait *next, *prev;
int node_id; int node_id;

17
arch/s390/mm/fault.c
View File

@ -165,6 +165,23 @@ static void dump_fault_info(struct pt_regs *regs)
int show_unhandled_signals = 1; int show_unhandled_signals = 1;
static const struct ctl_table s390_fault_sysctl_table[] = {
{
.procname = "userprocess_debug",
.data = &show_unhandled_signals,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
};
static int __init init_s390_fault_sysctls(void)
{
register_sysctl_init("kernel", s390_fault_sysctl_table);
return 0;
}
arch_initcall(init_s390_fault_sysctls);
void report_user_fault(struct pt_regs *regs, long signr, int is_mm_fault) void report_user_fault(struct pt_regs *regs, long signr, int is_mm_fault)
{ {
static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);

18
kernel/sysctl.c
View File

@ -1794,15 +1794,6 @@ static const struct ctl_table kern_table[] = {
.extra1 = SYSCTL_ZERO, .extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_MAXOLDUID, .extra2 = SYSCTL_MAXOLDUID,
}, },
#ifdef CONFIG_S390
{
.procname = "userprocess_debug",
.data = &show_unhandled_signals,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
#endif
{ {
.procname = "panic_on_oops", .procname = "panic_on_oops",
.data = &panic_on_oops, .data = &panic_on_oops,
@ -1897,15 +1888,6 @@ static const struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
#if defined(CONFIG_S390) && defined(CONFIG_SMP)
{
.procname = "spin_retry",
.data = &spin_retry,
.maxlen = sizeof (int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
#endif
#if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86) #if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86)
{ {
.procname = "acpi_video_flags", .procname = "acpi_video_flags",