summaryrefslogtreecommitdiff
path: root/src/basic/raw-clone.h
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2017-02-09 03:31:22 +0300
committerGitHub <noreply@github.com>2017-02-09 03:31:22 +0300
commit52a4aafb4dd178afae5ce8ceadd852233cac10f3 (patch)
treef1a0176cacb9f730e9d774d5467c391a18231996 /src/basic/raw-clone.h
parent2026e39b2d2f9a2951cdf72be53fde1f2dac4c63 (diff)
parentb8076e3d06dd93664969c774444b74be69d15d23 (diff)
Merge pull request #5270 from poettering/seccomp-namespace-fix
swap seccomp filter params on s390
Diffstat (limited to 'src/basic/raw-clone.h')
-rw-r--r--src/basic/raw-clone.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
index d473828999..c6e531ada4 100644
--- a/src/basic/raw-clone.h
+++ b/src/basic/raw-clone.h
@@ -47,8 +47,8 @@
static inline int raw_clone(unsigned long flags) {
assert((flags & (CLONE_VM|CLONE_PARENT_SETTID|CLONE_CHILD_SETTID|
CLONE_CHILD_CLEARTID|CLONE_SETTLS)) == 0);
-#if defined(__s390__) || defined(__CRIS__)
- /* On s390 and cris the order of the first and second arguments
+#if defined(__s390x__) || defined(__s390__) || defined(__CRIS__)
+ /* On s390/s390x and cris the order of the first and second arguments
* of the raw clone() system call is reversed. */
return (int) syscall(__NR_clone, NULL, flags);
#elif defined(__sparc__) && defined(__arch64__)