diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 14:24:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 14:24:56 -0800 |
| commit | bcc9f96681a1e272b38f16e324d4510823f85730 (patch) | |
| tree | 415bfe9058797568ea9e894dace067018ba232a2 /arch/alpha/lib/csum_partial_copy.c | |
| parent | b399c46ea0070671f3abbe1915d26076101a42f2 (diff) | |
| parent | 0ef38d70d4118b2ce1a538d14357be5ff9dc2bbd (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha updates from Matt Turner:
"A pair of changes for alpha. One fixes a networking regression, and
the second adds audit syscall support which will help in supporting
systemd"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: fix broken network checksum
alpha: Enable system-call auditing support.
Diffstat (limited to 'arch/alpha/lib/csum_partial_copy.c')
| -rw-r--r-- | arch/alpha/lib/csum_partial_copy.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c index ff3c10721ca..5675dca8dbb 100644 --- a/arch/alpha/lib/csum_partial_copy.c +++ b/arch/alpha/lib/csum_partial_copy.c @@ -378,6 +378,11 @@ 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) { - return csum_partial_copy_from_user((__force const void __user *)src, - dst, len, sum, NULL); + __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; } |