diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:10:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:10:19 -0700 |
commit | c8d8170feb824875baf68f8aaecb181a6500ce81 (patch) | |
tree | fc215c0776597015cd7e02ef12e24fe60e74961e /include/asm-xtensa/unistd.h | |
parent | 34750bb15687fa03ba95a0ccb1307b0727bc308b (diff) | |
parent | df5e38703d647b160d7ba300b3d2fcb64a48549a (diff) | |
download | linux-c8d8170feb824875baf68f8aaecb181a6500ce81.tar.gz linux-c8d8170feb824875baf68f8aaecb181a6500ce81.tar.bz2 linux-c8d8170feb824875baf68f8aaecb181a6500ce81.zip |
Merge git://git.linux-xtensa.org/kernel/xtensa-feed
* git://git.linux-xtensa.org/kernel/xtensa-feed:
Xtensa: use asm-generic/fcntl.h
[XTENSA] Remove non-rt signal handling
[XTENSA] Move common sections into bss sections
[XTENSA] clean-up header files
[XTENSA] Use generic 64-bit division
[XTENSA] Remove multi-exported symbols from xtensa_ksyms.c
[XTENSA] fix sources using deprecated assembler directive
[XTENSA] Spelling fixes in arch/xtensa
[XTENSA] fix bit operations in bitops.h
Diffstat (limited to 'include/asm-xtensa/unistd.h')
-rw-r--r-- | include/asm-xtensa/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h index 8a7fb6964ce1..9bd34024431c 100644 --- a/include/asm-xtensa/unistd.h +++ b/include/asm-xtensa/unistd.h @@ -485,8 +485,8 @@ __SYSCALL(217, sys_sched_get_priority_min, 1) __SYSCALL(218, sys_sched_rr_get_interval, 2) #define __NR_sched_yield 219 __SYSCALL(219, sys_sched_yield, 0) -#define __NR_sigreturn 222 -__SYSCALL(222, xtensa_sigreturn, 0) +#define __NR_available222 222 +__SYSCALL(222, sys_ni_syscall, 0) /* Signal Handling */ |