Commit 9e2f403d authored by Joel Granados's avatar Joel Granados
Browse files

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



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: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarKees Cook <kees@kernel.org>
Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent 851911aa

drivers/parisc/power.c

+19 −1
Original line number Diff line number Diff line
@@ -83,7 +83,25 @@ static struct task_struct *power_task; 
#define SYSCTL_FILENAME	"sys/kernel/power"



/* 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 */

static int kpowerswd(void *param)

include/linux/sysctl.h

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ int do_proc_douintvec(const struct ctl_table *table, int write, 
				  int write, void *data),

		      void *data);



extern int pwrsw_enabled;

extern int unaligned_enabled;

extern int unaligned_dump_stack;

extern int no_unaligned_warning;

kernel/sysctl.c

+0 −9
Original line number Diff line number Diff line
@@ -1594,15 +1594,6 @@ static const struct ctl_table kern_table[] = { 
		.extra2		= SYSCTL_ONE,

	},

#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

	{

		.procname	= "unaligned-trap",