* Removed it and replaced it with older style, 03/23/00, Bill Wendling
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/swap.h>
extern int C_A_D;
extern int sysctl_overcommit_memory;
extern int sysctl_overcommit_ratio;
-extern int sysctl_panic_on_oom;
extern int max_threads;
extern int sysrq_enabled;
extern int core_uses_pid;
extern int pid_max_min, pid_max_max;
extern int sysctl_drop_caches;
extern int percpu_pagelist_fraction;
-extern int compat_log;
#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
int unknown_nmi_panic;
void __user *, size_t *, loff_t *);
#endif
-extern unsigned int vdso_enabled, vdso_populate;
-
-int exec_shield = (1<<0);
-/* exec_shield is a bitmask:
- 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE
- (1<<0) 1: on [also on if !=0]
- (1<<1) 2: force noexecstack regardless of PT_GNU_STACK
- The old settings
- (1<<2) 4: vdso just below .text of main (unless too low)
- (1<<3) 8: vdso just below .text of PT_INTERP (unless too low)
- are ignored because the vdso is placed completely randomly
-*/
-
-static int __init setup_exec_shield(char *str)
-{
- get_option (&str, &exec_shield);
-
- return 1;
-}
-
-__setup("exec-shield=", setup_exec_shield);
-
/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
static int maxolduid = 65535;
static int minolduid;
extern int no_unaligned_warning;
#endif
-#ifdef CONFIG_RT_MUTEXES
-extern int max_lock_depth;
-#endif
-
static int parse_table(int __user *, int, void __user *, size_t __user *, void __user *, size_t,
ctl_table *, void **);
static int proc_doutsstring(ctl_table *table, int write, struct file *filp,
static ctl_table kern_table[];
static ctl_table vm_table[];
+static ctl_table proc_table[];
static ctl_table fs_table[];
static ctl_table debug_table[];
static ctl_table dev_table[];
#ifdef CONFIG_UNIX98_PTYS
extern ctl_table pty_table[];
#endif
-#ifdef CONFIG_INOTIFY_USER
+#ifdef CONFIG_INOTIFY
extern ctl_table inotify_table[];
#endif
.child = net_table,
},
#endif
+ {
+ .ctl_name = CTL_PROC,
+ .procname = "proc",
+ .mode = 0555,
+ .child = proc_table,
+ },
{
.ctl_name = CTL_FS,
.procname = "fs",
.mode = 0644,
.proc_handler = &proc_dointvec,
},
- {
- .ctl_name = KERN_EXEC_SHIELD,
- .procname = "exec-shield",
- .data = &exec_shield,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
- {
- .ctl_name = KERN_PRINT_FATAL,
- .procname = "print-fatal-signals",
- .data = &print_fatal_signals,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
-#ifdef __i386__
- {
- .ctl_name = KERN_VDSO,
- .procname = "vdso",
- .data = &vdso_enabled,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
- {
- .ctl_name = KERN_VDSO,
- .procname = "vdso_populate",
- .data = &vdso_populate,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
-#endif
{
.ctl_name = KERN_CORE_USES_PID,
.procname = "core_uses_pid",
.strategy = &sysctl_string,
},
#endif
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#ifdef CONFIG_HOTPLUG
{
.ctl_name = KERN_HOTPLUG,
.procname = "hotplug",
.proc_handler = &proc_dointvec,
},
#endif
-#ifdef CONFIG_COMPAT
- {
- .ctl_name = KERN_COMPAT_LOG,
- .procname = "compat-log",
- .data = &compat_log,
- .maxlen = sizeof (int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
-#endif
-#ifdef CONFIG_RT_MUTEXES
- {
- .ctl_name = KERN_MAX_LOCK_DEPTH,
- .procname = "max_lock_depth",
- .data = &max_lock_depth,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
-#endif
-
{ .ctl_name = 0 }
};
.mode = 0644,
.proc_handler = &proc_dointvec,
},
- {
- .ctl_name = VM_PANIC_ON_OOM,
- .procname = "panic_on_oom",
- .data = &sysctl_panic_on_oom,
- .maxlen = sizeof(sysctl_panic_on_oom),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
{
.ctl_name = VM_OVERCOMMIT_RATIO,
.procname = "overcommit_ratio",
{
.ctl_name = VM_DIRTY_WB_CS,
.procname = "dirty_writeback_centisecs",
- .data = &dirty_writeback_interval,
- .maxlen = sizeof(dirty_writeback_interval),
+ .data = &dirty_writeback_centisecs,
+ .maxlen = sizeof(dirty_writeback_centisecs),
.mode = 0644,
.proc_handler = &dirty_writeback_centisecs_handler,
},
{
.ctl_name = VM_DIRTY_EXPIRE_CS,
.procname = "dirty_expire_centisecs",
- .data = &dirty_expire_interval,
- .maxlen = sizeof(dirty_expire_interval),
+ .data = &dirty_expire_centisecs,
+ .maxlen = sizeof(dirty_expire_centisecs),
.mode = 0644,
- .proc_handler = &proc_dointvec_userhz_jiffies,
+ .proc_handler = &proc_dointvec,
},
{
.ctl_name = VM_NR_PDFLUSH_THREADS,
.data = &laptop_mode,
.maxlen = sizeof(laptop_mode),
.mode = 0644,
- .proc_handler = &proc_dointvec_jiffies,
- .strategy = &sysctl_jiffies,
+ .proc_handler = &proc_dointvec,
+ .strategy = &sysctl_intvec,
+ .extra1 = &zero,
},
{
.ctl_name = VM_BLOCK_DUMP,
.extra1 = &zero,
},
{
- .ctl_name = VM_MIN_UNMAPPED,
- .procname = "min_unmapped_ratio",
- .data = &sysctl_min_unmapped_ratio,
- .maxlen = sizeof(sysctl_min_unmapped_ratio),
- .mode = 0644,
- .proc_handler = &sysctl_min_unmapped_ratio_sysctl_handler,
- .strategy = &sysctl_intvec,
- .extra1 = &zero,
- .extra2 = &one_hundred,
- },
- {
- .ctl_name = VM_MIN_SLAB,
- .procname = "min_slab_ratio",
- .data = &sysctl_min_slab_ratio,
- .maxlen = sizeof(sysctl_min_slab_ratio),
+ .ctl_name = VM_ZONE_RECLAIM_INTERVAL,
+ .procname = "zone_reclaim_interval",
+ .data = &zone_reclaim_interval,
+ .maxlen = sizeof(zone_reclaim_interval),
.mode = 0644,
- .proc_handler = &sysctl_min_slab_ratio_sysctl_handler,
- .strategy = &sysctl_intvec,
- .extra1 = &zero,
- .extra2 = &one_hundred,
- },
-#endif
-#ifdef CONFIG_X86_32
- {
- .ctl_name = VM_VDSO_ENABLED,
- .procname = "vdso_enabled",
- .data = &vdso_enabled,
- .maxlen = sizeof(vdso_enabled),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- .strategy = &sysctl_intvec,
- .extra1 = &zero,
+ .proc_handler = &proc_dointvec_jiffies,
+ .strategy = &sysctl_jiffies,
},
#endif
{ .ctl_name = 0 }
};
+static ctl_table proc_table[] = {
+ { .ctl_name = 0 }
+};
+
static ctl_table fs_table[] = {
{
.ctl_name = FS_NRINODE,
.mode = 0644,
.proc_handler = &proc_doulongvec_minmax,
},
-#ifdef CONFIG_INOTIFY_USER
+#ifdef CONFIG_INOTIFY
{
.ctl_name = FS_INOTIFY,
.procname = "inotify",
int write, void *data)
{
if (write) {
- if (*lvalp > LONG_MAX / HZ)
- return 1;
*valp = *negp ? -(*lvalp*HZ) : (*lvalp*HZ);
} else {
int val = *valp;
int write, void *data)
{
if (write) {
- if (USER_HZ < HZ && *lvalp > (LONG_MAX / HZ) * USER_HZ)
- return 1;
*valp = clock_t_to_jiffies(*negp ? -*lvalp : *lvalp);
} else {
int val = *valp;
git://git.onelab.eu / linux-2.6.git / blobdiff