Messages in this thread Patch in this message | | | Subject | [PATCH 2/3] UML - __user annotations | Date | Mon, 10 Apr 2006 19:37:08 -0400 | From | Jeff Dike <> |
| |
From: Al Viro <viro@zeniv.linux.org.uk>
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>
Index: linux-2.6.16-mm/arch/um/sys-i386/signal.c =================================================================== --- linux-2.6.16-mm.orig/arch/um/sys-i386/signal.c 2006-04-08 17:21:35.000000000 -0400 +++ linux-2.6.16-mm/arch/um/sys-i386/signal.c 2006-04-10 14:39:42.000000000 -0400 @@ -57,7 +57,7 @@ static int copy_sc_from_user_skas(struct 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 sigconte 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_r 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), - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |