diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-05-13 09:15:18 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-05-13 09:15:18 -0400 |
| commit | 955e6ef2a0ddbcafd35cd363642e20d8ae7a33d7 (patch) | |
| tree | 0ca12b37d5fe6d2c270fe9bd8b17359358faddba /arch/alpha | |
| parent | 8cf02110a4ba9f6347d86ebbca28ffe19449afac (diff) | |
| parent | f453538a1f5b66168caf9c446c56375246b4ac29 (diff) | |
Merge tag 'v3.2.58' into v3.2-rt
This is the 3.2.58 stable release
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/lib/csum_partial_copy.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c index 1d2ef5a3fc84..40736da9bea8 100644 --- a/arch/alpha/lib/csum_partial_copy.c +++ b/arch/alpha/lib/csum_partial_copy.c @@ -373,11 +373,6 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) { - __wsum checksum; - mm_segment_t oldfs = get_fs(); - set_fs(KERNEL_DS); - checksum = csum_partial_copy_from_user((__force const void __user *)src, - dst, len, sum, NULL); - set_fs(oldfs); - return checksum; + return csum_partial_copy_from_user((__force const void __user *)src, + dst, len, sum, NULL); } |