diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-14 03:34:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 11:09:59 -0500 |
commit | 0b4d414714f0d2f922d39424b0c5c82ad900a381 (patch) | |
tree | 5079ec59a5622c9cacfe0fce484ba2c4626c406f /arch/s390 | |
parent | ae836810263509ff7a3c2c021754ce6f66b3fab6 (diff) |
[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: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Martin 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/appldata/appldata_base.c | 4 | ||||
-rw-r--r-- | arch/s390/kernel/debug.c | 2 | ||||
-rw-r--r-- | arch/s390/mm/cmm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index 58cefcf2d2cc..0c3cf4b16ae4 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
@@ -506,7 +506,7 @@ int appldata_register_ops(struct appldata_ops *ops) | |||
506 | 506 | ||
507 | ops->ctl_table[3].ctl_name = 0; | 507 | ops->ctl_table[3].ctl_name = 0; |
508 | 508 | ||
509 | ops->sysctl_header = register_sysctl_table(ops->ctl_table,0); | 509 | ops->sysctl_header = register_sysctl_table(ops->ctl_table); |
510 | 510 | ||
511 | P_INFO("%s-ops registered!\n", ops->name); | 511 | P_INFO("%s-ops registered!\n", ops->name); |
512 | return 0; | 512 | return 0; |
@@ -606,7 +606,7 @@ static int __init appldata_init(void) | |||
606 | /* Register cpu hotplug notifier */ | 606 | /* Register cpu hotplug notifier */ |
607 | register_hotcpu_notifier(&appldata_nb); | 607 | register_hotcpu_notifier(&appldata_nb); |
608 | 608 | ||
609 | appldata_sysctl_header = register_sysctl_table(appldata_dir_table, 0); | 609 | appldata_sysctl_header = register_sysctl_table(appldata_dir_table); |
610 | #ifdef MODULE | 610 | #ifdef MODULE |
611 | appldata_dir_table[0].de->owner = THIS_MODULE; | 611 | appldata_dir_table[0].de->owner = THIS_MODULE; |
612 | appldata_table[0].de->owner = THIS_MODULE; | 612 | appldata_table[0].de->owner = THIS_MODULE; |
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 1b95148dc73b..eca3fe595ff4 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -1053,7 +1053,7 @@ __init debug_init(void) | |||
1053 | { | 1053 | { |
1054 | int rc = 0; | 1054 | int rc = 0; |
1055 | 1055 | ||
1056 | s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table, 0); | 1056 | s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table); |
1057 | down(&debug_lock); | 1057 | down(&debug_lock); |
1058 | debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT,NULL); | 1058 | debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT,NULL); |
1059 | printk(KERN_INFO "debug: Initialization complete\n"); | 1059 | printk(KERN_INFO "debug: Initialization complete\n"); |
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index c6d6ddeb5e33..c5b2f4f078bc 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c | |||
@@ -418,7 +418,7 @@ cmm_init (void) | |||
418 | int rc = -ENOMEM; | 418 | int rc = -ENOMEM; |
419 | 419 | ||
420 | #ifdef CONFIG_CMM_PROC | 420 | #ifdef CONFIG_CMM_PROC |
421 | cmm_sysctl_header = register_sysctl_table(cmm_dir_table, 0); | 421 | cmm_sysctl_header = register_sysctl_table(cmm_dir_table); |
422 | if (!cmm_sysctl_header) | 422 | if (!cmm_sysctl_header) |
423 | goto out; | 423 | goto out; |
424 | #endif | 424 | #endif |