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);