diff options
| author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2012-12-24 10:51:36 +0530 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-26 01:15:01 -0500 |
| commit | f13a3664e4d1de8adc1fc82b981ba4699a731fa1 (patch) | |
| tree | c7ee77b81dd73362586716cbdafd1cf11a46a591 | |
| parent | f80b0c904da93b9ad7db2fd9823dd701932df779 (diff) | |
CONFIG_GENERIC_SIGALTSTACK build breakage with asm-generic/syscalls.h
Saner transition plan for GENERIC_SIGALTSTACK conversion - instead of
adding #define sys_sigaltstack sys_sigaltstack in asm/syscalls.h of
architecture if it's pulls asm-generic/syscalls.h, only to have those
defines removed once all architectures are converted, make the
declaration in said asm-generic/syscalls.h conditional on the lack
of GENERIC_SIGALTSTACK. Less messy in intermediate stages that way...
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: james.hogan@imgtec.com
Cc: arnd@arndb.de
Cc: torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | include/asm-generic/syscalls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h index 58f466ff00d..1db51b8524e 100644 --- a/include/asm-generic/syscalls.h +++ b/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); |