diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:02:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:02:22 -0700 |
| commit | 7974b1cc7879141962999e78a6fc9a136dc4479e (patch) | |
| tree | 716dd2f284007bea9b7e2e577770e895dc300874 /include | |
| parent | c4f92dba97f4e3aa757500896f87001569f4604b (diff) | |
| parent | 62ee914ef27fded9d1c5da41e1e05c3bd175c529 (diff) | |
| download | talos-op-linux-7974b1cc7879141962999e78a6fc9a136dc4479e.tar.gz talos-op-linux-7974b1cc7879141962999e78a6fc9a136dc4479e.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/unistd.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index ace27480886e..abb36e54c966 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h @@ -350,6 +350,11 @@ #endif #define __NR_vserver (__NR_SYSCALL_BASE+313) +#define __NR_ioprio_set (__NR_SYSCALL_BASE+314) +#define __NR_ioprio_get (__NR_SYSCALL_BASE+315) +#define __NR_inotify_init (__NR_SYSCALL_BASE+316) +#define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317) +#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318) /* * The following SWIs are ARM private. |
