aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-06-23 05:04:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:42:54 -0400
commit53470aaa02ef3c83187f1ffe0d2cb647274fe397 (patch)
treed270412696da4d845be0003d442de0421ffa009e /arch/frv/kernel
parent530018bf3d93e04533eec9c6516e3ce8f5310e13 (diff)
[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/kernel')
-rw-r--r--arch/frv/kernel/irq.c6
-rw-r--r--arch/frv/kernel/process.c2
-rw-r--r--arch/frv/kernel/sys_frv.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index 11fa326a8f62..8b112b361914 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];
625 625
626#define HEX_DIGITS 8 626#define HEX_DIGITS 8
627 627
628static unsigned int parse_hex_value (const char *buffer, 628static unsigned int parse_hex_value (const char __user *buffer,
629 unsigned long count, unsigned long *ret) 629 unsigned long count, unsigned long *ret)
630{ 630{
631 unsigned char hexnum [HEX_DIGITS]; 631 unsigned char hexnum [HEX_DIGITS];
@@ -672,7 +672,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
672 return sprintf (page, "%08lx\n", *mask); 672 return sprintf (page, "%08lx\n", *mask);
673} 673}
674 674
675static int prof_cpu_mask_write_proc (struct file *file, const char *buffer, 675static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer,
676 unsigned long count, void *data) 676 unsigned long count, void *data)
677{ 677{
678 unsigned long *mask = (unsigned long *) data, full_count = count, err; 678 unsigned long *mask = (unsigned long *) data, full_count = count, err;
@@ -711,7 +711,7 @@ void init_irq_proc (void)
711 int i; 711 int i;
712 712
713 /* create /proc/irq */ 713 /* create /proc/irq */
714 root_irq_dir = proc_mkdir("irq", 0); 714 root_irq_dir = proc_mkdir("irq", NULL);
715 715
716 /* create /proc/irq/prof_cpu_mask */ 716 /* create /proc/irq/prof_cpu_mask */
717 entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir); 717 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 0fff8a61ef2a..489e6c489cbe 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,
246/* 246/*
247 * sys_execve() executes a new program. 247 * sys_execve() executes a new program.
248 */ 248 */
249asmlinkage int sys_execve(char *name, char **argv, char **envp) 249asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp)
250{ 250{
251 int error; 251 int error;
252 char * filename; 252 char * filename;
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index 931aa6d895e3..c4d4348c9e8e 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -32,7 +32,7 @@
32 * sys_pipe() is the normal C calling standard for creating 32 * sys_pipe() is the normal C calling standard for creating
33 * a pipe. It's not the way unix traditionally does this, though. 33 * a pipe. It's not the way unix traditionally does this, though.
34 */ 34 */
35asmlinkage long sys_pipe(unsigned long * fildes) 35asmlinkage long sys_pipe(unsigned long __user * fildes)
36{ 36{
37 int fd[2]; 37 int fd[2];
38 int error; 38 int error;