From d2b320c5e3813ef4f800d40d1e60dba6f420e13d Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 6 Nov 2012 13:28:21 -0500
Subject: [PATCH] --- yaml --- r: 356655 b: refs/heads/master c:
 5a1b98d3096f1d780045f9be812335ad77aed93d h: refs/heads/master i:   356653:
 aa28c2afbe1e313c00099a951bc2024db3a8036c   356651:
 13e9a904948c502de3506a4e5ea6887902ce2ac2   356647:
 07ad6aae067489b4474fdae301542e9869e81921   356639:
 10cd975e5d8949e629b6b392af3669ae26a11dd6 v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/sched.h | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 15d15929ad66..c71e37a4a2c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ce5da17570771330f44ac993b77749debf7954b
+refs/heads/master: 5a1b98d3096f1d780045f9be812335ad77aed93d
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 6fc8f45de4e9..8f983293b403 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -2305,6 +2305,17 @@ static inline int sas_ss_flags(unsigned long sp)
 		: on_sig_stack(sp) ? SS_ONSTACK : 0);
 }
 
+static inline unsigned long sigsp(unsigned long sp, struct ksignal *ksig)
+{
+	if (unlikely((ksig->ka.sa.sa_flags & SA_ONSTACK)) && ! sas_ss_flags(sp))
+#ifdef CONFIG_STACK_GROWSUP
+		return current->sas_ss_sp;
+#else
+		return current->sas_ss_sp + current->sas_ss_size;
+#endif
+	return sp;
+}
+
 /*
  * Routines for handling mm_structs
  */