diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
| commit | 9c9ab385bc6c3f0787f742d5e9baf04063d9697a (patch) | |
| tree | cc6ac425f7580a40d011ad2e8fc7974678843e0b /tools/testing/selftests/vm/userfaultfd.c | |
| parent | 93f13a9f96771a064c716364aebc6e283b186eb8 (diff) | |
| parent | bcee19f424a0d8c26ecf2607b73c690802658b29 (diff) | |
Merge branch 'linus' into x86/asm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/vm/userfaultfd.c')
| -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 |