lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: __user annotations

Browse Source 
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:
Al Viro
2006-04-18 22:21:42 -07:00
committed by Linus Torvalds
parent ad28e02978
commit f983c45ebe
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/um/sys-i386/signal.c
View File

@@ -57,7 +57,7 @@ static int copy_sc_from_user_skas(struct pt_regs *regs,
return(0); 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 pt_regs *regs, unsigned long sp)
{ {
struct sigcontext sc; struct sigcontext sc;
@@ -132,7 +132,7 @@ int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext __user *from,
return(err); 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 sigcontext *from, int fpsize, unsigned long sp)
{ {
struct _fpstate __user *to_fp; struct _fpstate __user *to_fp;
@@ -167,7 +167,7 @@ static int copy_sc_from_user(struct pt_regs *to, void __user *from)
return(ret); 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) struct pt_regs *from, unsigned long sp)
{ {
return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs), return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs),