diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-06 05:48:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 05:48:27 -0800 |
| commit | 7418ff988b520466d04cacf6d88b50d67bfa8ddf (patch) | |
| tree | 0b7514c1633dbcc7950286b7941158851cf9d96b /pkg/rootless | |
| parent | 2dc8568368b6ef9fe3f31fd791b850205b303564 (diff) | |
| parent | ca5114faf9286ce15d168f3ffd6864df820c0121 (diff) | |
| download | podman-7418ff988b520466d04cacf6d88b50d67bfa8ddf.tar.gz podman-7418ff988b520466d04cacf6d88b50d67bfa8ddf.tar.bz2 podman-7418ff988b520466d04cacf6d88b50d67bfa8ddf.zip | |
Merge pull request #2543 from giuseppe/fix-rootless-s390x-cris
rootless: fix clone syscall on s390 and cris archs
Diffstat (limited to 'pkg/rootless')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index dfbc7fe33..41acd3475 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -32,7 +32,11 @@ syscall_setresgid (gid_t rgid, gid_t egid, gid_t sgid) static int syscall_clone (unsigned long flags, void *child_stack) { +#if defined(__s390__) || defined(__CRIS__) + return (int) syscall (__NR_clone, child_stack, flags); +#else return (int) syscall (__NR_clone, flags, child_stack); +#endif } static char ** |