torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

parisc/power: Move soft-power into power.c

Browse Source 
Move the soft-power ctl table into parisc/power.c. As a consequence the
pwrsw_enabled var is made static.

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.

Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Kees Cook <kees@kernel.org>
Signed-off-by: Joel Granados <joel.granados@kernel.org>
This commit is contained in:
Joel Granados 2025-05-02 15:32:17 +02:00
parent 851911aa72
commit 9e2f403dd8
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/parisc/power.c
View File

@ -83,7 +83,25 @@ static struct task_struct *power_task;
#define SYSCTL_FILENAME "sys/kernel/power" #define SYSCTL_FILENAME "sys/kernel/power"
/* soft power switch enabled/disabled */ /* soft power switch enabled/disabled */
int pwrsw_enabled __read_mostly = 1; static int pwrsw_enabled __read_mostly = 1;
static const struct ctl_table power_sysctl_table[] = {
{
.procname = "soft-power",
.data = &pwrsw_enabled,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
};
static int __init init_power_sysctl(void)
{
register_sysctl_init("kernel", power_sysctl_table);
return 0;
}
arch_initcall(init_power_sysctl);
/* main kernel thread worker. It polls the button state */ /* main kernel thread worker. It polls the button state */
static int kpowerswd(void *param) static int kpowerswd(void *param)

1
include/linux/sysctl.h
View File

@ -242,7 +242,6 @@ int do_proc_douintvec(const struct ctl_table *table, int write,
int write, void *data), int write, void *data),
void *data); void *data);
extern int pwrsw_enabled;
extern int unaligned_enabled; extern int unaligned_enabled;
extern int unaligned_dump_stack; extern int unaligned_dump_stack;
extern int no_unaligned_warning; extern int no_unaligned_warning;

9
kernel/sysctl.c
View File

@ -1594,15 +1594,6 @@ static const struct ctl_table kern_table[] = {
.extra2 = SYSCTL_ONE, .extra2 = SYSCTL_ONE,
}, },
#endif #endif
#ifdef CONFIG_PARISC
{
.procname = "soft-power",
.data = &pwrsw_enabled,
.maxlen = sizeof (int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
#endif
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW
{ {
.procname = "unaligned-trap", .procname = "unaligned-trap",