diff -Nurp util-vserver-0.30.210.orig/lib_internal/sys_clone.h util-vserver-0.30.210.clone-arch/lib_internal/sys_clone.h
--- util-vserver-0.30.210.orig/lib_internal/sys_clone.h	2005-04-28 20:01:37.000000000 +0200
+++ util-vserver-0.30.210.clone-arch/lib_internal/sys_clone.h	2006-04-10 23:43:29.000000000 +0200
@@ -19,33 +19,54 @@
 #ifndef H_UTIL_VSERVER_SRC_SYS_CLONE_H
 #define H_UTIL_VSERVER_SRC_SYS_CLONE_H
 
+#include <unistd.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
 #endif
 
-#ifdef ENSC_SYSCALL_TRADITIONAL
-#include <unistd.h>
+#ifndef ENSC_SYSCALL_TRADITIONAL
+#  include <errno.h>
 
+#  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 <errno.h>
 
-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