From: janboe Date: Wed, 19 Mar 2008 02:34:23 +0000 (+0100) Subject: [ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT X-Git-Tag: v2.6.25-rc7~59^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ee4cd588a3d9f81b5b13b76a498c3118a61f1dd2;p=linux-2.6-omap-h63xx.git [ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT fix signal return code when enable CONFIG_OABI_COMPAT Signed-off-by: Janboe Ye Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 54cdf1aeefc..ef2f86a5e78 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -26,8 +26,8 @@ /* * For ARM syscalls, we encode the syscall number into the instruction. */ -#define SWI_SYS_SIGRETURN (0xef000000|(__NR_sigreturn)) -#define SWI_SYS_RT_SIGRETURN (0xef000000|(__NR_rt_sigreturn)) +#define SWI_SYS_SIGRETURN (0xef000000|(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)) +#define SWI_SYS_RT_SIGRETURN (0xef000000|(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)) /* * With EABI, the syscall number has to be loaded into r7.