[PATCH v2] s390: fix SIGNAL_FRAMESIZE macro

[Tuan Hoang]

Since __SIGNAL_FRAMESIZE is in private name space, it is better not to
use it directly. This macro has been stable on s390/s390x so it is safe
to use the integer value.

Signed-off-by: Tuan Hoang <tmhoang at linux.ibm.com>
---
 linux/s390/arch_sigreturn.c  | 2 +-
 linux/s390/rt_sigframe.h     | 8 +++++++-
 linux/s390x/arch_sigreturn.c | 4 +---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/linux/s390/arch_sigreturn.c b/linux/s390/arch_sigreturn.c
index 1d0f0e00..4a9ca8ec 100644
--- a/linux/s390/arch_sigreturn.c
+++ b/linux/s390/arch_sigreturn.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef SIGNAL_FRAMESIZE
-# define SIGNAL_FRAMESIZE __SIGNAL_FRAMESIZE
+# define SIGNAL_FRAMESIZE 96
 #endif
 #ifndef PTR_TYPE
 # define PTR_TYPE unsigned long
diff --git a/linux/s390/rt_sigframe.h b/linux/s390/rt_sigframe.h
index e11573a4..f243f5e7 100644
--- a/linux/s390/rt_sigframe.h
+++ b/linux/s390/rt_sigframe.h
@@ -10,8 +10,14 @@
 
 # include <signal.h>
 
+#if defined __s390__
+# define SIGNAL_FRAMESIZE 96
+#elif defined __s390x__
+# define SIGNAL_FRAMESIZE 160
+#endif
+
 typedef struct {
-	uint8_t		callee_used_stack[__SIGNAL_FRAMESIZE];
+	uint8_t		callee_used_stack[SIGNAL_FRAMESIZE];
 	uint16_t	svc_insn;
 	siginfo_t	info;
 	ucontext_t	uc;
diff --git a/linux/s390x/arch_sigreturn.c b/linux/s390x/arch_sigreturn.c
index 55930a35..2d75a8c6 100644
--- a/linux/s390x/arch_sigreturn.c
+++ b/linux/s390x/arch_sigreturn.c
@@ -7,9 +7,6 @@
 
 #include <stdint.h>
 
-#define S390_SIGNAL_FRAMESIZE      96
-
-#define SIGNAL_FRAMESIZE	S390_SIGNAL_FRAMESIZE
 #define PTR_TYPE		uint32_t
 #define arch_sigreturn	s390_arch_sigreturn
 #include "s390/arch_sigreturn.c"
@@ -17,6 +14,7 @@
 #undef PTR_TYPE
 #undef SIGNAL_FRAMESIZE
 
+#define SIGNAL_FRAMESIZE	160
 #define arch_sigreturn	s390x_arch_sigreturn
 #include "s390/arch_sigreturn.c"
 #undef arch_sigreturn
-- 
2.20.1