From fdcaebe0374b831995a74f54fcbfb43a3d6996b9 Mon Sep 17 00:00:00 2001
From: Stelian Pop <stelian@popies.net>
Date: Fri, 20 May 2011 09:52:19 +0000
Subject: [PATCH] Better s390 patch from Adam Tkac.

---
 dump/tape.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dump/tape.c b/dump/tape.c
index aa0ecc4..e46d626 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.92 2011/05/20 09:48:40 stelian Exp $";
+	"$Id: tape.c,v 1.93 2011/05/20 09:52:19 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -211,13 +211,17 @@ 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 */
+/*
+ * Parameters of the sys_clone syscall are
+ * clone_flags, child_stack, parent_tidptr, child_tidptr
+ * on all architectures except s390 and s390x
+ * s390* have child_stack, clone_flags, parent_tidptr, child_tidptr
+ */
+#if defined(__s390__) || defined(__s390x__)
 #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__ */
+#endif
 #else
 #define CLONE_ARGS SIGCHLD|CLONE_IO, 0
 #endif /* LINUX_VERSION_CODE */
-- 
2.39.5