diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:50:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:50:21 -0700 |
| commit | 00c04db982b66fe9e8c8c5156808b905199bd645 (patch) | |
| tree | d394c01dceffe37a6f67cccfc2e87a64aad7740a /arch/arm/kernel/signal.c | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into m (diff) | |
| download | linux-dev-00c04db982b66fe9e8c8c5156808b905199bd645.tar.xz linux-dev-00c04db982b66fe9e8c8c5156808b905199bd645.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4872/1: Replaces buggy macro in S3C2410 irq include
[ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT
[ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp
[ARM] 4865/1: Register the F75375 device in the GLAN Tank platform code
[ARM] 4864/1: Enable write buffer coalescing on IOP
[ARM] 4863/1: AT91: CAP9 USART definitions for early debug
[ARM] 4861/1: AT91: Update maintainer email address (again)
ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization
ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt
ARM: OMAP: Fix chain_a_transfer return value
ARM: OMAP: Fix missing makefile options
ARM: OMAP: Fix GPIO IRQ unmask
ARM: OMAP: Fix clockevent support for hrtimers
Diffstat (limited to 'arch/arm/kernel/signal.c')
| -rw-r--r-- | arch/arm/kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 54cdf1aeefc3..ef2f86a5e78a 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. |