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

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

sysctl arm: Remove 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.

Remove a smattering of ctl_names used in sysctl paths,
and kill the ctl_names in the recently added mach-bcmring.

mach-bcmring never should have had sysctl entries with
.ctl_name set.  The binary sysctl interface has been frozen
for a long time before that code was merged, to prevent
probmes with conflicts and lack of testing.   The sysctl_check
code would have caught this if anyone had ever tested it that way.
So I have simply dropped the binary sysctl support instead of
adding another compat entry into sysctl_binary.c.  Going through
/proc/sys/reboot/warm will still work.

Cc: Leo Chen <leochen@broadcom.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 24a06562

arch/arm/kernel/isa.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -22,47 +22,42 @@ static unsigned int isa_membase, isa_portbase, isa_portshift; 




static ctl_table ctl_isa_vars[4] = {

static ctl_table ctl_isa_vars[4] = {

	{

	{

		.ctl_name	= BUS_ISA_MEM_BASE,

		.procname	= "membase",

		.procname	= "membase",

		.data		= &isa_membase, 

		.data		= &isa_membase, 

		.maxlen		= sizeof(isa_membase),

		.maxlen		= sizeof(isa_membase),

		.mode		= 0444,

		.mode		= 0444,

		.proc_handler	= &proc_dointvec,

		.proc_handler	= &proc_dointvec,

	}, {

	}, {

		.ctl_name	= BUS_ISA_PORT_BASE,

		.procname	= "portbase",

		.procname	= "portbase",

		.data		= &isa_portbase, 

		.data		= &isa_portbase, 

		.maxlen		= sizeof(isa_portbase),

		.maxlen		= sizeof(isa_portbase),

		.mode		= 0444,

		.mode		= 0444,

		.proc_handler	= &proc_dointvec,

		.proc_handler	= &proc_dointvec,

	}, {

	}, {

		.ctl_name	= BUS_ISA_PORT_SHIFT,

		.procname	= "portshift",

		.procname	= "portshift",

		.data		= &isa_portshift, 

		.data		= &isa_portshift, 

		.maxlen		= sizeof(isa_portshift),

		.maxlen		= sizeof(isa_portshift),

		.mode		= 0444,

		.mode		= 0444,

		.proc_handler	= &proc_dointvec,

		.proc_handler	= &proc_dointvec,

	}, {0}

	}, {}

};

};





static struct ctl_table_header *isa_sysctl_header;

static struct ctl_table_header *isa_sysctl_header;





static ctl_table ctl_isa[2] = {

static ctl_table ctl_isa[2] = {

	{

	{

		.ctl_name	= CTL_BUS_ISA,

		.procname	= "isa",

		.procname	= "isa",

		.mode		= 0555,

		.mode		= 0555,

		.child		= ctl_isa_vars,

		.child		= ctl_isa_vars,

	}, {0}

	}, {}

};

};





static ctl_table ctl_bus[2] = {

static ctl_table ctl_bus[2] = {

	{

	{

		.ctl_name	= CTL_BUS,

		.procname	= "bus",

		.procname	= "bus",

		.mode		= 0555,

		.mode		= 0555,

		.child		= ctl_isa,

		.child		= ctl_isa,

	}, {0}

	}, {}

};

};





void __init

void __init

arch/arm/mach-bcmring/arch.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -47,10 +47,6 @@ HW_DECLARE_SPINLOCK(gpio) 
    EXPORT_SYMBOL(bcmring_gpio_reg_lock);

    EXPORT_SYMBOL(bcmring_gpio_reg_lock);

#endif

#endif





/* FIXME: temporary solution */

#define BCM_SYSCTL_REBOOT_WARM               1

#define CTL_BCM_REBOOT                 112



/* sysctl */

/* sysctl */

int bcmring_arch_warm_reboot;	/* do a warm reboot on hard reset */

int bcmring_arch_warm_reboot;	/* do a warm reboot on hard reset */
@@ -58,7 +54,6 @@ static struct ctl_table_header *bcmring_sysctl_header; 




static struct ctl_table bcmring_sysctl_warm_reboot[] = {

static struct ctl_table bcmring_sysctl_warm_reboot[] = {

	{

	{

	 .ctl_name = BCM_SYSCTL_REBOOT_WARM,

	 .procname = "warm",

	 .procname = "warm",

	 .data = &bcmring_arch_warm_reboot,

	 .data = &bcmring_arch_warm_reboot,

	 .maxlen = sizeof(int),

	 .maxlen = sizeof(int),
@@ -69,7 +64,6 @@ static struct ctl_table bcmring_sysctl_warm_reboot[] = { 




static struct ctl_table bcmring_sysctl_reboot[] = {

static struct ctl_table bcmring_sysctl_reboot[] = {

	{

	{

	 .ctl_name = CTL_BCM_REBOOT,

	 .procname = "reboot",

	 .procname = "reboot",

	 .mode = 0555,

	 .mode = 0555,

	 .child = bcmring_sysctl_warm_reboot},

	 .child = bcmring_sysctl_warm_reboot},