Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a09b6e81 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

sysctl sh: Remove dead binary sysctl support 



Now that sys_sysctl is a generic wrapper around /proc/sys  .ctl_name
and .strategy members of sysctl tables are dead code.  Remove them.

Also add an C99 named initializer to the child member of unaligned_root
to prevent chaos as the ctl_table definition changes over time.

Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 26ea5135

arch/sh/kernel/traps_64.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -877,7 +877,6 @@ static int misaligned_fixup(struct pt_regs *regs) 




static ctl_table unaligned_table[] = {

static ctl_table unaligned_table[] = {

	{

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "kernel_reports",

		.procname	= "kernel_reports",

		.data		= &kernel_mode_unaligned_fixup_count,

		.data		= &kernel_mode_unaligned_fixup_count,

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(int),
@@ -885,7 +884,6 @@ static ctl_table unaligned_table[] = { 
		.proc_handler	= &proc_dointvec

		.proc_handler	= &proc_dointvec

	},

	},

	{

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "user_reports",

		.procname	= "user_reports",

		.data		= &user_mode_unaligned_fixup_count,

		.data		= &user_mode_unaligned_fixup_count,

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(int),
@@ -893,7 +891,6 @@ static ctl_table unaligned_table[] = { 
		.proc_handler	= &proc_dointvec

		.proc_handler	= &proc_dointvec

	},

	},

	{

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "user_enable",

		.procname	= "user_enable",

		.data		= &user_mode_unaligned_fixup_enable,

		.data		= &user_mode_unaligned_fixup_enable,

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(int),
@@ -904,17 +901,15 @@ static ctl_table unaligned_table[] = { 




static ctl_table unaligned_root[] = {

static ctl_table unaligned_root[] = {

	{

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "unaligned_fixup",

		.procname	= "unaligned_fixup",

		.mode		= 0555,

		.mode		= 0555,

		unaligned_table

		.child		= unaligned_table

	},

	},

	{}

	{}

};

};





static ctl_table sh64_root[] = {

static ctl_table sh64_root[] = {

	{

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "sh64",

		.procname	= "sh64",

		.mode		= 0555,

		.mode		= 0555,

		.child		= unaligned_root

		.child		= unaligned_root