diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
| commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
| tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /include/asm-x86_64/unistd.h | |
| parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-x86_64/unistd.h')
| -rw-r--r-- | include/asm-x86_64/unistd.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 6560439a83e4..11ba931cf82f 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h | |||
| @@ -565,8 +565,14 @@ __SYSCALL(__NR_keyctl, sys_keyctl) | |||
| 565 | __SYSCALL(__NR_ioprio_set, sys_ioprio_set) | 565 | __SYSCALL(__NR_ioprio_set, sys_ioprio_set) |
| 566 | #define __NR_ioprio_get 252 | 566 | #define __NR_ioprio_get 252 |
| 567 | __SYSCALL(__NR_ioprio_get, sys_ioprio_get) | 567 | __SYSCALL(__NR_ioprio_get, sys_ioprio_get) |
| 568 | 568 | #define __NR_inotify_init 253 | |
| 569 | #define __NR_syscall_max __NR_ioprio_get | 569 | __SYSCALL(__NR_inotify_init, sys_inotify_init) |
| 570 | #define __NR_inotify_add_watch 254 | ||
| 571 | __SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch) | ||
| 572 | #define __NR_inotify_rm_watch 255 | ||
| 573 | __SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch) | ||
| 574 | |||
| 575 | #define __NR_syscall_max __NR_inotify_rm_watch | ||
| 570 | #ifndef __NO_STUBS | 576 | #ifndef __NO_STUBS |
| 571 | 577 | ||
| 572 | /* user-visible error numbers are in the range -1 - -4095 */ | 578 | /* user-visible error numbers are in the range -1 - -4095 */ |