diff options
author | Steve French <sfrench@hera.kernel.org> | 2005-06-30 20:57:39 -0700 |
---|---|---|
committer | Steve French <sfrench@hera.kernel.org> | 2005-06-30 20:57:39 -0700 |
commit | ab997aaeb9cf7a0da1cecc46c5bb6c7262416917 (patch) | |
tree | b8a09ed676101a2478d17c1d71da1274293c3c64 /include/asm-x86_64/unistd.h | |
parent | fa5cfae37799177769e9ae2c0527fbdfea462fa9 (diff) | |
parent | bd53d1270f51c6cfb53b06c8f93fd42327871d6b (diff) | |
download | talos-op-linux-ab997aaeb9cf7a0da1cecc46c5bb6c7262416917.tar.gz talos-op-linux-ab997aaeb9cf7a0da1cecc46c5bb6c7262416917.zip |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/unistd.h')
-rw-r--r-- | include/asm-x86_64/unistd.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 3c9af6fd4332..6560439a83e4 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h @@ -552,7 +552,7 @@ __SYSCALL(__NR_mq_notify, sys_mq_notify) #define __NR_mq_getsetattr 245 __SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr) #define __NR_kexec_load 246 -__SYSCALL(__NR_kexec_load, sys_ni_syscall) +__SYSCALL(__NR_kexec_load, sys_kexec_load) #define __NR_waitid 247 __SYSCALL(__NR_waitid, sys_waitid) #define __NR_add_key 248 @@ -561,8 +561,12 @@ __SYSCALL(__NR_add_key, sys_add_key) __SYSCALL(__NR_request_key, sys_request_key) #define __NR_keyctl 250 __SYSCALL(__NR_keyctl, sys_keyctl) +#define __NR_ioprio_set 251 +__SYSCALL(__NR_ioprio_set, sys_ioprio_set) +#define __NR_ioprio_get 252 +__SYSCALL(__NR_ioprio_get, sys_ioprio_get) -#define __NR_syscall_max __NR_keyctl +#define __NR_syscall_max __NR_ioprio_get #ifndef __NO_STUBS /* user-visible error numbers are in the range -1 - -4095 */ |