---

yaml
---
r: 348999
b: refs/heads/master
c: ad30f3f
h: refs/heads/master
i:
  348997: 85749d8
  348995: 59f88c1
  348991: 08eaf3b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34360f080cb5848990576e1465d2d01a3c261762
+refs/heads/master: ad30f3ff3deb4037f2beea15812d01d795f8b3cc

trunk/arch/parisc/kernel/signal.c

@@ -190,8 +190,10 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
 	DBG(1,"get_sigframe: ka = %#lx, sp = %#lx, frame_size = %#lx\n",
 			(unsigned long)ka, sp, frame_size);
 
+	/* Align alternate stack and reserve 64 bytes for the signal
+	   handler's frame marker.  */
 	if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp))
-		sp = current->sas_ss_sp; /* Stacks grow up! */
+		sp = (current->sas_ss_sp + 0x7f) & ~0x3f; /* Stacks grow up! */
 
 	DBG(1,"get_sigframe: Returning sp = %#lx\n", (unsigned long)sp);
 	return (void __user *) sp; /* Stacks grow up.  Fun. */