diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 10:30:20 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 10:30:20 +0200 |
commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
tree | 765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-cris/unistd.h | |
parent | [SERIAL] Convert parport_serial to use new 8250_pci interfaces (diff) | |
parent | [PATCH] new alpha syscalls (diff) | |
download | linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.xz linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip |
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-cris/unistd.h')
-rw-r--r-- | include/asm-cris/unistd.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h index e80bf276b101..28232ad2ff34 100644 --- a/include/asm-cris/unistd.h +++ b/include/asm-cris/unistd.h @@ -288,8 +288,15 @@ #define __NR_mq_timedreceive (__NR_mq_open+3) #define __NR_mq_notify (__NR_mq_open+4) #define __NR_mq_getsetattr (__NR_mq_open+5) - -#define NR_syscalls 283 +#define __NR_sys_kexec_load 283 +#define __NR_waitid 284 +/* #define __NR_sys_setaltroot 285 */ +#define __NR_add_key 286 +#define __NR_request_key 287 +#define __NR_keyctl 288 + +#define NR_syscalls 289 + #ifdef __KERNEL__ |