From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 5 Mar 2015 04:29:37 +0000 (+0000)
Subject: ppc64: fix compilation warning
X-Git-Tag: v4.10~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67dab706cf50cf6103c28f5c7c1d965bde51ad0d;p=strace

ppc64: fix compilation warning

Fix compilation warning introduced by commit
577be2593d4895ef941e1c4e5e1608f7dd13610d

* signal.c (sys_sigreturn) [POWERPC64]: Fix initialization of signal
mask on 32bit personality.
---

diff --git a/signal.c b/signal.c
index 34b29468..a970355c 100644
--- a/signal.c
+++ b/signal.c
@@ -793,14 +793,11 @@ sys_sigreturn(struct tcb *tcp)
 		} else {
 			unsigned long mask[NSIG / 8 / sizeof(long)];
 #ifdef POWERPC64
-			if (current_personality == 0)
-				mask[0] = sc.oldmask | (sc._unused[3] << 32);
-			else
+			mask[0] = sc.oldmask | (sc._unused[3] << 32);
+#else
+			mask[0] = sc.oldmask;
+			mask[1] = sc._unused[3];
 #endif
-			{
-				mask[0] = sc.oldmask;
-				mask[1] = sc._unused[3];
-			}
 			tprintsigmask_val("", mask);
 		}
 		tprints("}");