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

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

[PATCH] sysctl: remove insert_at_head from register_sysctl 



The semantic effect of insert_at_head is that it would allow new registered
sysctl entries to override existing sysctl entries of the same name.  Which is
pain for caching and the proc interface never implemented.

I have done an audit and discovered that none of the current users of
register_sysctl care as (excpet for directories) they do not register
duplicate sysctl entries.

So this patch simply removes the support for overriding existing entries in
the sys_sysctl interface since no one uses it or cares and it makes future
enhancments harder.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: David Howells <dhowells@redhat.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Corey Minyard <minyard@acm.org>
Cc: Neil Brown <neilb@suse.de>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Jan Kara <jack@ucw.cz>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: David Chinner <dgc@sgi.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ae836810

arch/arm/kernel/isa.c

+1 −1
Original line number Diff line number Diff line
@@ -70,5 +70,5 @@ register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int por 
	isa_membase = membase;

	isa_portbase = portbase;

	isa_portshift = portshift;

	isa_sysctl_header = register_sysctl_table(ctl_bus, 0);

	isa_sysctl_header = register_sysctl_table(ctl_bus);

}

arch/frv/kernel/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static struct ctl_table pm_dir_table[] = 
 */

static int __init pm_init(void)

{

	register_sysctl_table(pm_dir_table, 0);

	register_sysctl_table(pm_dir_table);

	return 0;

}

arch/frv/kernel/sysctl.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static struct ctl_table frv_dir_table[] = 
 */

static int __init frv_sysctl_init(void)

{

	register_sysctl_table(frv_dir_table, 0);

	register_sysctl_table(frv_dir_table);

	return 0;

}

arch/ia64/kernel/crash.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ machine_crash_setup(void) 
	if((ret = register_die_notifier(&kdump_init_notifier_nb)) != 0)

		return ret;

#ifdef CONFIG_SYSCTL

	register_sysctl_table(sys_table, 0);

	register_sysctl_table(sys_table);

#endif

	return 0;

}

arch/ia64/kernel/perfmon.c

+1 −1
Original line number Diff line number Diff line
@@ -6726,7 +6726,7 @@ pfm_init(void) 
	/*

	 * create /proc/sys/kernel/perfmon (for debugging purposes)

	 */

	pfm_sysctl_header = register_sysctl_table(pfm_sysctl_root, 0);

	pfm_sysctl_header = register_sysctl_table(pfm_sysctl_root);



	/*

	 * initialize all our spinlocks