From d49b45258c2aaef200eea78fbb3b3f3b7c995d39 Mon Sep 17 00:00:00 2001
From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Date: Mon, 24 Dec 2012 10:51:36 +0530
Subject: [PATCH] --- yaml --- r: 348919 b: refs/heads/master c:
 f13a3664e4d1de8adc1fc82b981ba4699a731fa1 h: refs/heads/master i:   348917:
 51fcd692090575304db07659a89bbd198ed4a47f   348915:
 87482739dad70b3e972e61fa0c4d2c5a2869577d   348911:
 89ca5a5027b24309a6c2a4ec7640988768742d1e v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-generic/syscalls.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f033ccf257a7..1e3d072780c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f80b0c904da93b9ad7db2fd9823dd701932df779
+refs/heads/master: f13a3664e4d1de8adc1fc82b981ba4699a731fa1
diff --git a/trunk/include/asm-generic/syscalls.h b/trunk/include/asm-generic/syscalls.h
index 58f466ff00d3..1db51b8524e9 100644
--- a/trunk/include/asm-generic/syscalls.h
+++ b/trunk/include/asm-generic/syscalls.h
@@ -21,10 +21,12 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
 			unsigned long fd, off_t pgoff);
 #endif
 
+#ifndef CONFIG_GENERIC_SIGALTSTACK
 #ifndef sys_sigaltstack
 asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *,
 			struct pt_regs *);
 #endif
+#endif
 
 #ifndef sys_rt_sigreturn
 asmlinkage long sys_rt_sigreturn(struct pt_regs *regs);