summaryrefslogtreecommitdiff
path: root/include/linux/sysctl.h
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@maxwell.earthlink.net>2003-04-09 17:18:03 -0700
committerJames Simmons <jsimmons@maxwell.earthlink.net>2003-04-09 17:18:03 -0700
commit64a8617fd15a19894f350148bf6a6cb3a57513a0 (patch)
treeba49e65c772b4c07d56cc58a17cd92a56e92d647 /include/linux/sysctl.h
parent6a47ae51629e75c7915886649a4961d6f433e3a0 (diff)
parent5edf8b9a4208987e60e0f41aff0bcc298641c0ad (diff)
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'include/linux/sysctl.h')
-rw-r--r--include/linux/sysctl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index f6a32a5dc496..79b779f29c9f 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -679,8 +679,8 @@ extern void sysctl_init(void);
typedef struct ctl_table ctl_table;
typedef int ctl_handler (ctl_table *table, int *name, int nlen,
- void *oldval, size_t *oldlenp,
- void *newval, size_t newlen,
+ void __user *oldval, size_t __user *oldlenp,
+ void __user *newval, size_t newlen,
void **context);
typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
@@ -707,8 +707,8 @@ extern int do_sysctl (int *name, int nlen,
extern int do_sysctl_strategy (ctl_table *table,
int *name, int nlen,
- void *oldval, size_t *oldlenp,
- void *newval, size_t newlen, void ** context);
+ void __user *oldval, size_t __user *oldlenp,
+ void __user *newval, size_t newlen, void ** context);
extern ctl_handler sysctl_string;
extern ctl_handler sysctl_intvec;