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

Commit e3c6449d authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] sysctl: C99 convert arch/sh64/kernel/traps.c and remove ABI breakage 



While doing the C99 conversion I notices that the top level sh64 directory was
using the binary number for CTL_KERN.  That is a no-no so I removed the
support for the sysctl binary interface only leaving sysctl /proc support.

At least the sysctl tables were placed at the end of the list so user space
did not see this mistake.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ded2e9bd

arch/sh64/kernel/traps.c

+38 −11
Original line number Diff line number Diff line
@@ -910,25 +910,52 @@ static int misaligned_fixup(struct pt_regs *regs) 
}



static ctl_table unaligned_table[] = {

	{1, "kernel_reports", &kernel_mode_unaligned_fixup_count,

		sizeof(int), 0644, NULL, &proc_dointvec},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "kernel_reports",

		.data		= &kernel_mode_unaligned_fixup_count,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)

	{2, "user_reports", &user_mode_unaligned_fixup_count,

		sizeof(int), 0644, NULL, &proc_dointvec},

	{3, "user_enable", &user_mode_unaligned_fixup_enable,

		sizeof(int), 0644, NULL, &proc_dointvec},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "user_reports",

		.data		= &user_mode_unaligned_fixup_count,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "user_enable",

		.data		= &user_mode_unaligned_fixup_enable,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec},

#endif

	{0}

	{}

};



static ctl_table unaligned_root[] = {

	{1, "unaligned_fixup", NULL, 0, 0555, unaligned_table},

	{0}

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "unaligned_fixup",

		.mode		= 0555,

		unaligned_table

	},

	{}

};



static ctl_table sh64_root[] = {

	{1, "sh64", NULL, 0, 0555, unaligned_root},

	{0}

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "sh64",

		.mode		= 0555,

		.child		= unaligned_root

	},

	{}

};

static struct ctl_table_header *sysctl_header;

static int __init init_sysctl(void)