diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /kernel/sysctl.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 70da2a029..5591ee2bc 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -54,10 +54,10 @@ static int minolduid; #ifdef CONFIG_KMOD extern char modprobe_path[]; +#endif #ifdef CONFIG_HOTPLUG extern char hotplug_path[]; #endif -#endif #ifdef CONFIG_CHR_DEV_SG extern int sg_big_buff; #endif @@ -188,11 +188,11 @@ static ctl_table kern_table[] = { #ifdef CONFIG_KMOD {KERN_MODPROBE, "modprobe", &modprobe_path, 256, 0644, NULL, &proc_dostring, &sysctl_string }, +#endif #ifdef CONFIG_HOTPLUG {KERN_HOTPLUG, "hotplug", &hotplug_path, 256, 0644, NULL, &proc_dostring, &sysctl_string }, #endif -#endif #ifdef CONFIG_CHR_DEV_SG {KERN_SG_BIG_BUFF, "sg-big-buff", &sg_big_buff, sizeof (int), 0444, NULL, &proc_dointvec}, @@ -571,7 +571,7 @@ static void unregister_proc_table(ctl_table * table, struct proc_dir_entry *root } /* Don't unregister proc entries that are still being used.. */ - if (de->count) + if (atomic_read(&de->count)) continue; table->de = NULL; @@ -1240,6 +1240,13 @@ int sysctl_intvec(ctl_table *table, int *name, int nlen, return -ENOSYS; } +int sysctl_jiffies(ctl_table *table, int *name, int nlen, + void *oldval, size_t *oldlenp, + void *newval, size_t newlen, void **context) +{ + return -ENOSYS; +} + int proc_dostring(ctl_table *table, int write, struct file *filp, void *buffer, size_t *lenp) { |