summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2003-04-16 01:35:05 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2003-04-16 01:35:05 -0700
commit8e368e793e46e0a627b11c7016dbb0cb752c8599 (patch)
tree933dc1130ab83b927c6c3769cfdb11bc3c8bf6b4 /include/linux
parent3f069ce54e339de329402afb16eeffa38bf561d9 (diff)
Add more user pointer annotations.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/binfmts.h2
-rw-r--r--include/linux/sched.h2
-rw-r--r--include/linux/uio.h1
3 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index b51f0cbc76e4..753cef720f66 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -56,7 +56,7 @@ extern void remove_arg_zero(struct linux_binprm *);
extern int search_binary_handler(struct linux_binprm *,struct pt_regs *);
extern int flush_old_exec(struct linux_binprm * bprm);
extern int setup_arg_pages(struct linux_binprm * bprm);
-extern int copy_strings(int argc,char ** argv,struct linux_binprm *bprm);
+extern int copy_strings(int argc,char __user * __user * argv,struct linux_binprm *bprm);
extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm);
extern void compute_creds(struct linux_binprm *binprm);
extern int do_coredump(long signr, int exit_code, struct pt_regs * regs);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index bbc51fac0cf6..c30c44f3cfcc 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -629,7 +629,7 @@ extern void daemonize(const char *, ...);
extern int allow_signal(int);
extern task_t *child_reaper;
-extern int do_execve(char *, char **, char **, struct pt_regs *);
+extern int do_execve(char *, char __user * __user *, char __user * __user *, struct pt_regs *);
extern struct task_struct *do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int *, int *);
#ifdef CONFIG_SMP
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 6baad885c745..8bc074189f96 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -1,6 +1,7 @@
#ifndef __LINUX_UIO_H
#define __LINUX_UIO_H
+#include <linux/compiler.h>
#include <linux/types.h>
/*