From: Stelian Pop <stelian@popies.net>
Date: Fri, 20 May 2011 09:48:40 +0000 (+0000)
Subject: Fix SYS_clone on s390
X-Git-Tag: release_0_4b44~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=13dd8b0533159735a7179eaafc894a8422b13184;p=dump.git

Fix SYS_clone on s390
---

diff --git a/CHANGES b/CHANGES
index 78d1a88..ad21b75 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.321 2011/05/05 16:05:40 stelian Exp $
+$Id: CHANGES,v 1.322 2011/05/20 09:48:40 stelian Exp $
 
 
 Changes between versions 0.4b43 and 0.4b44 (released ?????????????)
@@ -22,6 +22,10 @@ Changes between versions 0.4b43 and 0.4b44 (released ?????????????)
 	dumps were created (Debian bug #583093). Thanks to
 	Mark Wooding <mdw@distorted.org.uk> for the patch.
 
+5.	Fix SYS_clone invocation on s390 architectures (Sourceforge
+	bug #3303235). Thanks to Adam Tkac <atkac@redhat.com> for
+	reporting the bug.
+
 Changes between versions 0.4b42 and 0.4b43 (released June 11, 2010)
 ===================================================================
 
diff --git a/dump/tape.c b/dump/tape.c
index edcf5d6..aa0ecc4 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.91 2009/06/18 09:50:54 stelian Exp $";
+	"$Id: tape.c,v 1.92 2011/05/20 09:48:40 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -211,8 +211,13 @@ static int gtperr = 0;
  * Neither is useful in our case, so this is easy to handle.
  */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,49)
+#if __s390__
+/* child_stack, clone_flags, parent_tidptr, child_tidptr */
+#define CLONE_ARGS 0, SIGCHLD|CLONE_IO, NULL, NULL
+#else
 /* clone_flags, child_stack, parent_tidptr, child_tidptr */
 #define CLONE_ARGS SIGCHLD|CLONE_IO, 0, NULL, NULL
+#endif /* __s390__ */
 #else
 #define CLONE_ARGS SIGCHLD|CLONE_IO, 0
 #endif /* LINUX_VERSION_CODE */