Bastian
--
We Klingons believe as you do -- the sick should die. Only the strong
should live.
-- Kras, "Friday's Child", stardate 3497.2
--- util-vserver-0.30.209/debian/changelog
+++ util-vserver-0.30.209/debian/changelog
@@ -1,3 +1,10 @@
+util-vserver (0.30.209-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix usage of clone syscall for s390. (closes: #356417)
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Sun, 02 Apr 2006 15:08:48 +0000
+
util-vserver (0.30.209-2) unstable; urgency=low
* Include delta-0.30.209-shiny8.diff fixing syscalls for mips
--- util-vserver-0.30.209.orig/lib_internal/sys_clone.h
+++ util-vserver-0.30.209/lib_internal/sys_clone.h
@@ -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
@@ -36,16 +36,27 @@
extern long int syscall (long int __sysno, ...);
#endif
+#if defined(__s390__)
+ return syscall(__NR_sys_clone, stack, flags);
+#error
return syscall(__NR_sys_clone, flags, stack);
+#endif
}
#else
#include <errno.h>
+#if defined(__s390__)
+inline static UNUSED ALWAYSINLINE
+_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)
+_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
