diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-06-23 02:04:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 07:42:54 -0700 |
commit | 53470aaa02ef3c83187f1ffe0d2cb647274fe397 (patch) | |
tree | d270412696da4d845be0003d442de0421ffa009e /arch/frv | |
parent | 530018bf3d93e04533eec9c6516e3ce8f5310e13 (diff) | |
download | kernel_samsung_espresso10-53470aaa02ef3c83187f1ffe0d2cb647274fe397.zip kernel_samsung_espresso10-53470aaa02ef3c83187f1ffe0d2cb647274fe397.tar.gz kernel_samsung_espresso10-53470aaa02ef3c83187f1ffe0d2cb647274fe397.tar.bz2 |
[PATCH] frv: misc __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/frv')
-rw-r--r-- | arch/frv/kernel/irq.c | 6 | ||||
-rw-r--r-- | arch/frv/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/frv/kernel/sys_frv.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c index 11fa326..8b112b3 100644 --- a/arch/frv/kernel/irq.c +++ b/arch/frv/kernel/irq.c @@ -625,7 +625,7 @@ static struct proc_dir_entry * irq_dir [NR_IRQS]; #define HEX_DIGITS 8 -static unsigned int parse_hex_value (const char *buffer, +static unsigned int parse_hex_value (const char __user *buffer, unsigned long count, unsigned long *ret) { unsigned char hexnum [HEX_DIGITS]; @@ -672,7 +672,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, return sprintf (page, "%08lx\n", *mask); } -static int prof_cpu_mask_write_proc (struct file *file, const char *buffer, +static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer, unsigned long count, void *data) { unsigned long *mask = (unsigned long *) data, full_count = count, err; @@ -711,7 +711,7 @@ void init_irq_proc (void) int i; /* create /proc/irq */ - root_irq_dir = proc_mkdir("irq", 0); + root_irq_dir = proc_mkdir("irq", NULL); /* create /proc/irq/prof_cpu_mask */ entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir); diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 0fff8a6..489e6c4 100644 --- a/arch/frv/kernel/process.c +++ b/arch/frv/kernel/process.c @@ -246,7 +246,7 @@ int copy_thread(int nr, unsigned long clone_flags, /* * sys_execve() executes a new program. */ -asmlinkage int sys_execve(char *name, char **argv, char **envp) +asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp) { int error; char * filename; diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c index 931aa6d..c4d4348 100644 --- a/arch/frv/kernel/sys_frv.c +++ b/arch/frv/kernel/sys_frv.c @@ -32,7 +32,7 @@ * sys_pipe() is the normal C calling standard for creating * a pipe. It's not the way unix traditionally does this, though. */ -asmlinkage long sys_pipe(unsigned long * fildes) +asmlinkage long sys_pipe(unsigned long __user * fildes) { int fd[2]; int error; |