diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:31:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:30 -0500 |
commit | c5d4bb171cab17576779a51d23d313abcb3db102 (patch) | |
tree | 6470c3c55b172db68dfd4f880c60da72e30c488f /arch/um/kernel/uaccess.c | |
parent | e6a2d1f7024f93e4622cd7ba633666a63ccce49e (diff) |
uml: style fixes in arch/um/kernel
Joe Perches noticed some printks in smp.c that needed fixing.
While I was in there, I did the usual tidying in arch/um/kernel, which
should be fairly style-clean at this point:
copyright updates
emacs formatting comments removal
include tidying
style fixes
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel/uaccess.c')
-rw-r--r-- | arch/um/kernel/uaccess.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/um/kernel/uaccess.c b/arch/um/kernel/uaccess.c index d7436aacd26f..f0f4b040d7c5 100644 --- a/arch/um/kernel/uaccess.c +++ b/arch/um/kernel/uaccess.c | |||
@@ -1,10 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk) | 2 | * Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk) |
3 | * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com) | 3 | * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) |
4 | * Licensed under the GPL | 4 | * Licensed under the GPL |
5 | */ | 5 | */ |
6 | 6 | ||
7 | /* These are here rather than tt/uaccess.c because skas mode needs them in | 7 | /* |
8 | * These are here rather than tt/uaccess.c because skas mode needs them in | ||
8 | * order to do SIGBUS recovery when a tmpfs mount runs out of room. | 9 | * order to do SIGBUS recovery when a tmpfs mount runs out of room. |
9 | */ | 10 | */ |
10 | 11 | ||
@@ -25,6 +26,8 @@ int __do_copy_to_user(void *to, const void *from, int n, | |||
25 | 26 | ||
26 | fault = __do_user_copy(to, from, n, fault_addr, fault_catcher, | 27 | fault = __do_user_copy(to, from, n, fault_addr, fault_catcher, |
27 | __do_copy, &faulted); | 28 | __do_copy, &faulted); |
28 | if(!faulted) return(0); | 29 | if (!faulted) |
29 | else return(n - (fault - (unsigned long) to)); | 30 | return 0; |
31 | else | ||
32 | return n - (fault - (unsigned long) to); | ||
30 | } | 33 | } |