[PATCH] uml: __user annotations
bits of uml __user annotations lost in merge Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
ad28e02978
commit
f983c45ebe
1 changed files with 3 additions and 3 deletions
|
@ -57,7 +57,7 @@ static int copy_sc_from_user_skas(struct pt_regs *regs,
|
|||
return(0);
|
||||
}
|
||||
|
||||
int copy_sc_to_user_skas(struct sigcontext *to, struct _fpstate __user *to_fp,
|
||||
int copy_sc_to_user_skas(struct sigcontext __user *to, struct _fpstate __user *to_fp,
|
||||
struct pt_regs *regs, unsigned long sp)
|
||||
{
|
||||
struct sigcontext sc;
|
||||
|
@ -132,7 +132,7 @@ int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext __user *from,
|
|||
return(err);
|
||||
}
|
||||
|
||||
int copy_sc_to_user_tt(struct sigcontext *to, struct _fpstate __user *fp,
|
||||
int copy_sc_to_user_tt(struct sigcontext __user *to, struct _fpstate __user *fp,
|
||||
struct sigcontext *from, int fpsize, unsigned long sp)
|
||||
{
|
||||
struct _fpstate __user *to_fp;
|
||||
|
@ -167,7 +167,7 @@ static int copy_sc_from_user(struct pt_regs *to, void __user *from)
|
|||
return(ret);
|
||||
}
|
||||
|
||||
static int copy_sc_to_user(struct sigcontext *to, struct _fpstate __user *fp,
|
||||
static int copy_sc_to_user(struct sigcontext __user *to, struct _fpstate __user *fp,
|
||||
struct pt_regs *from, unsigned long sp)
|
||||
{
|
||||
return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs),
|
||||
|
|
Loading…
Reference in a new issue