diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-09 07:19:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-09 07:19:26 -0700 |
| commit | 2f5c576e4ec4ee284b56fc6416d53c736aa82b87 (patch) | |
| tree | 756373477b6533eb6f8e84e57b47fe5a69c44fa4 /include/linux/sysctl.h | |
| parent | 9709b8137d14557b6a5d336dd1c6c9674a8a4263 (diff) | |
| parent | c8690d4ec40a8b8e97f5f62786bae229f53c6bd9 (diff) | |
Merge bk://linux-dj.bkbits.net/agpgart
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 8 |
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; |