summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-20 05:13:31 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-20 05:13:31 -0500
commitff607748590fba14aecedb0d50edc4ada98d4302 (patch)
tree986e0a3abe922713069a8e8bc913043fed89a39a /kernel/sysctl.c
parentdb024d5398cd332023896caf70530564b15ec88e (diff)
parent6aff8f1f07a7fff48121d1ad4a550f3af24ccc81 (diff)
Merge branch 'upstream'
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 71dd6f62efec..7654d55c47f5 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -126,8 +126,6 @@ extern int sysctl_hz_timer;
extern int acct_parm[];
#endif
-int randomize_va_space = 1;
-
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,