X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib_internal%2Fsys_clone.h;h=f30e8a2c3289655e8e1dd6bdbb9b77e467562c1b;hb=be41237a12dad904d92e58373f670113bb730a24;hp=eb549d30e2103cc3f25875c2ec8dfa254ad73656;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/lib_internal/sys_clone.h b/lib_internal/sys_clone.h index eb549d3..f30e8a2 100644 --- a/lib_internal/sys_clone.h +++ b/lib_internal/sys_clone.h @@ -19,33 +19,47 @@ #ifndef H_UTIL_VSERVER_SRC_SYS_CLONE_H #define H_UTIL_VSERVER_SRC_SYS_CLONE_H +#include #include "lib/syscall-wrap.h" -#define __NR_sys_clone __NR_clone +#define __NR__sys_clone __NR_clone -#ifndef CLONE_NEWNS -# define CLONE_NEWNS 0x00020000 -#endif +#ifndef ENSC_SYSCALL_TRADITIONAL +# include -#ifdef ENSC_SYSCALL_TRADITIONAL -#include +# if defined(__s390__) +inline static UNUSED ALWAYSINLINE +_syscall2(int, _sys_clone, void *, child_stack, int, flags) +# else +inline static UNUSED ALWAYSINLINE +_syscall2(int, _sys_clone, int, flags, void *, child_stack) +# endif +#endif inline static UNUSED ALWAYSINLINE -int sys_clone(int flags, void *stack) +int sys_clone(int flags, void *child_stack) { -#if defined __dietlibc__ - extern long int syscall (long int __sysno, ...); + int ret; +#ifdef __sparc__ + int parent = getpid(); #endif - - return syscall(__NR_sys_clone, flags, stack); -} -#else -#include -inline static UNUSED ALWAYSINLINE -_syscall2(int, sys_clone, int, flags, void *, child_stack) +#if defined(__s390__) && defined(ENSC_SYSCALL_TRADITIONAL) + ret = syscall(__NR__sys_clone, child_stack, flags); +#elif defined(__s390__) + ret = _sys_clone(child_stack, flags); +#elif defined(ENSC_SYSCALL_TRADITIONAL) + ret = syscall(__NR__sys_clone, flags, child_stack); +#else + ret = _sys_clone(flags, child_stack); +#endif +#ifdef __sparc__ + if (ret == parent) + ret = 0; #endif + return ret; +} -#undef __NR_sys_clone +#undef __NR__sys_clone #define ENSC_HAVE_SYSCLONE 1