[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>
This commit is contained in:
parent
530018bf3d
commit
53470aaa02
4 changed files with 6 additions and 6 deletions
|
@ -625,7 +625,7 @@ static struct proc_dir_entry * irq_dir [NR_IRQS];
|
||||||
|
|
||||||
#define HEX_DIGITS 8
|
#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 long count, unsigned long *ret)
|
||||||
{
|
{
|
||||||
unsigned char hexnum [HEX_DIGITS];
|
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);
|
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 count, void *data)
|
||||||
{
|
{
|
||||||
unsigned long *mask = (unsigned long *) data, full_count = count, err;
|
unsigned long *mask = (unsigned long *) data, full_count = count, err;
|
||||||
|
@ -711,7 +711,7 @@ void init_irq_proc (void)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* create /proc/irq */
|
/* create /proc/irq */
|
||||||
root_irq_dir = proc_mkdir("irq", 0);
|
root_irq_dir = proc_mkdir("irq", NULL);
|
||||||
|
|
||||||
/* create /proc/irq/prof_cpu_mask */
|
/* create /proc/irq/prof_cpu_mask */
|
||||||
entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
|
entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
|
||||||
|
|
|
@ -246,7 +246,7 @@ int copy_thread(int nr, unsigned long clone_flags,
|
||||||
/*
|
/*
|
||||||
* sys_execve() executes a new program.
|
* 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;
|
int error;
|
||||||
char * filename;
|
char * filename;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
* sys_pipe() is the normal C calling standard for creating
|
* sys_pipe() is the normal C calling standard for creating
|
||||||
* a pipe. It's not the way unix traditionally does this, though.
|
* 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 fd[2];
|
||||||
int error;
|
int error;
|
||||||
|
|
|
@ -43,7 +43,7 @@ unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum);
|
||||||
* here even more important to align src and dst on a 32-bit (or even
|
* here even more important to align src and dst on a 32-bit (or even
|
||||||
* better 64-bit) boundary
|
* better 64-bit) boundary
|
||||||
*/
|
*/
|
||||||
extern unsigned int csum_partial_copy_from_user(const char *src, char *dst,
|
extern unsigned int csum_partial_copy_from_user(const char __user *src, char *dst,
|
||||||
int len, int sum, int *csum_err);
|
int len, int sum, int *csum_err);
|
||||||
|
|
||||||
#define csum_partial_copy_nocheck(src, dst, len, sum) \
|
#define csum_partial_copy_nocheck(src, dst, len, sum) \
|
||||||
|
|
Loading…
Reference in a new issue