2017-06-29 22:24 GMT+03:00 Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>: > On s390 the first two paramters are swapped because we use > the CONFIG_CLONE_BACKWARDS2 kernel config option. > > Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx> Reviewed-by: Dmitry Safonov <dsafonov@xxxxxxxxxxxxx> > --- > criu/util.c | 5 +++++ > test/zdtm/lib/test.c | 5 +++++ > 2 files changed, 10 insertions(+) > > diff --git a/criu/util.c b/criu/util.c > index db484f2..2adc613 100644 > --- a/criu/util.c > +++ b/criu/util.c > @@ -1427,5 +1427,10 @@ pid_t fork() > * Two last arguments are swapped on different archs, > * but we don't care as they are zero anyway. > */ > +#ifdef __s390x__ > + /* See kernel/fork.c: CONFIG_CLONE_BACKWARDS2 */ > + return (pid_t)syscall(__NR_clone, 0, SIGCHLD, NULL, 0, NULL); > +#else > return (pid_t)syscall(__NR_clone, SIGCHLD, 0, 0, 0, 0); > +#endif > } > diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c > index 76357da..5f12083 100644 > --- a/test/zdtm/lib/test.c > +++ b/test/zdtm/lib/test.c > @@ -292,7 +292,12 @@ pid_t fork() > * Two last arguments are swapped on different archs, > * but we don't care as they are zero anyway. > */ > +#ifdef __s390x__ > + /* See kernel/fork.c: CONFIG_CLONE_BACKWARDS2 */ > + return (pid_t)syscall(__NR_clone, 0, SIGCHLD, NULL, 0, NULL); > +#else > return (pid_t)syscall(__NR_clone, SIGCHLD, 0, 0, 0, 0); > +#endif > } > > int getpid() > -- > 2.7.4 > > _______________________________________________ > CRIU mailing list > CRIU@xxxxxxxxxx > https://lists.openvz.org/mailman/listinfo/criu -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
