From 8dd52dc02550d6eb9657e331b1ae610ad6b7b560 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 12 Sep 2006 11:11:39 +0000 Subject: [PATCH] Fix sys_clone usage on sparc and s390, sparc returns parent pid in the child and s390 has the arguments reversed. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2296 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- lib_internal/sys_clone.h | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/lib_internal/sys_clone.h b/lib_internal/sys_clone.h index eb549d3..f797ac8 100644 --- a/lib_internal/sys_clone.h +++ b/lib_internal/sys_clone.h @@ -19,33 +19,54 @@ #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 -#ifdef ENSC_SYSCALL_TRADITIONAL -#include +#ifndef ENSC_SYSCALL_TRADITIONAL +# include +# if defined(__s390__) inline static UNUSED ALWAYSINLINE -int sys_clone(int flags, void *stack) +_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 *child_stack) { -#if defined __dietlibc__ + int ret; +#ifdef __sparc__ + int parent = getpid(); +#endif +#if defined(__dietlibc__) && defined(ENSC_SYSCALL_TRADITIONAL) extern long int syscall (long int __sysno, ...); #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 -- 1.8.1.5