Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f983c45e authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] uml: __user annotations 



bits of uml __user annotations lost in merge

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ad28e029

arch/um/sys-i386/signal.c

+3 −3
Original line number Diff line number Diff line
@@ -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),