diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-21 09:53:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-21 09:53:30 -0700 |
| commit | 90a835f5d19217ad1e174e40ef35d0acf3357828 (patch) | |
| tree | 4d227abb98bb9c577c3b761ca3376691a28e8f03 /tools | |
| parent | b7f76ea2ef6739ee484a165ffbac98deb855d3d3 (diff) | |
| parent | 977108f89c989b1eeb5c8d938e1e71913391eb5f (diff) | |
| download | linux-90a835f5d19217ad1e174e40ef35d0acf3357828.tar.gz linux-90a835f5d19217ad1e174e40ef35d0acf3357828.tar.bz2 linux-90a835f5d19217ad1e174e40ef35d0acf3357828.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"A couple of system call updates. The two new system calls userfaultfd
and membarrier have been added, as well as the 17 direct calls for the
multiplexed socket system calls.
In addition the system call compat wrappers have been flagged as
notrace functions and a few wrappers could be removed.
And bug fixes for the vector register handling, cpu_mf, suspend/resume,
compat signals, SMT cputime accounting and the zfcp dumper"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: wire up separate socketcalls system calls
s390/compat: remove superfluous compat wrappers
s390/compat: do not trace compat wrapper functions
s390/s390x: allocate sys_membarrier system call number
s390/configs//zfcpdump_defconfig: Remove CONFIG_MEMSTICK
s390: wire up userfaultfd system call
s390/vtime: correct scaled cputime for SMT
s390/cpum_cf: Corrected return code for unauthorized counter sets
s390/compat: correct uc_sigmask of the compat signal frame
s390: fix floating point register corruption
s390/hibernate: fix save and restore of vector registers
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/vm/userfaultfd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index 2c7cca6f26a4..7c1d958857d2 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -72,6 +72,8 @@ #define __NR_userfaultfd 374 #elif defined(__powewrpc__) #define __NR_userfaultfd 364 +#elif defined(__s390__) +#define __NR_userfaultfd 355 #else #error "missing __NR_userfaultfd definition" #endif |