#! /bin/sh /usr/share/dpatch/dpatch-run ## 06_s390syscall.dpatch by Micah Anderson > ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad util-vserver-0.30.210~/lib_internal/sys_clone.h util-vserver-0.30.210/lib_internal/sys_clone.h --- util-vserver-0.30.210~/lib_internal/sys_clone.h 2005-04-28 20:01:37.000000000 +0200 +++ util-vserver-0.30.210/lib_internal/sys_clone.h 2006-04-06 00:25:17.175047383 +0200 @@ -20,7 +20,7 @@ #define H_UTIL_VSERVER_SRC_SYS_CLONE_H #include "lib/syscall-wrap.h" -#define __NR_sys_clone __NR_clone +#define __NR__sys_clone __NR_clone #ifndef CLONE_NEWNS # define CLONE_NEWNS 0x00020000 @@ -30,22 +30,33 @@ #include inline static UNUSED ALWAYSINLINE -int sys_clone(int flags, void *stack) +int _sys_clone(int flags, void *stack) { #if defined __dietlibc__ extern long int syscall (long int __sysno, ...); #endif - return syscall(__NR_sys_clone, flags, stack); +#if defined(__s390__) + return syscall(__NR__sys_clone, stack, flags); +#else + return syscall(__NR__sys_clone, flags, stack); +#endif } #else #include +#if defined(__s390__) inline static UNUSED ALWAYSINLINE -_syscall2(int, sys_clone, int, flags, void *, child_stack) +_syscall2(int, _sys_clone, void *, child_stack, int, flags) +#define sys_clone(flags, child_stack) _sys_clone(child_stack, flags) +#else +inline static UNUSED ALWAYSINLINE +_syscall2(int, _sys_clone, int, flags, void *, child_stack) +#define sys_clone(flags, child_stack) _sys_clone(flags, child_stack) +#endif #endif -#undef __NR_sys_clone +#undef __NR__sys_clone #define ENSC_HAVE_SYSCLONE 1