diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-03 08:44:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-03 08:44:43 -0700 |
| commit | 4ad72555b8421a9dceb2085079aeaee871c4888e (patch) | |
| tree | ff1b059f93eea34013ac70783b7c33c6623180c8 /arch/s390/include | |
| parent | 3ccfcdc9efe861983d26d56f1f0ecae3f61a3a09 (diff) | |
| parent | d09c5373e8e4eaaa09233552cbf75dc4c4f21203 (diff) | |
| download | op-kernel-dev-4ad72555b8421a9dceb2085079aeaee871c4888e.zip op-kernel-dev-4ad72555b8421a9dceb2085079aeaee871c4888e.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Four bug fixes, two of them for stable:
- avoid initrd corruptions in the kernel decompressor
- prevent inconsistent dumps if the boot CPU does not have address
zero
- fix the new pkey interface added with the merge window for 4.11
- a fix for a fix, another issue with user copy zero padding"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/uaccess: get_user() should zero on failure (again)
s390/pkey: Fix wrong handling of secure key with old MKVP
s390/smp: fix ipl from cpu with non-zero address
s390/decompressor: fix initrd corruption caused by bss clear
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index 136932f..3ea1554 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -147,7 +147,7 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from, " jg 2b\n" \ ".popsection\n" \ EX_TABLE(0b,3b) EX_TABLE(1b,3b) \ - : "=d" (__rc), "=Q" (*(to)) \ + : "=d" (__rc), "+Q" (*(to)) \ : "d" (size), "Q" (*(from)), \ "d" (__reg0), "K" (-EFAULT) \ : "cc"); \ |
