Merge ../torvalds-2.6/

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / unistd.h

diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index f7f43ec2483a604640e965a7feb39df031fe65e5..2bf543493cb86675d7b3ec43bd58b8f684e6196b 100644 (file)
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -263,7 +263,12 @@
 #define __NR_add_key                   1271
 #define __NR_request_key               1272
 #define __NR_keyctl                    1273
-#define __NR_set_zone_reclaim          1276
+#define __NR_ioprio_set                        1274
+#define __NR_ioprio_get                        1275
+/* 1276 is available for reuse (was briefly sys_set_zone_reclaim) */
+#define __NR_inotify_init              1277
+#define __NR_inotify_add_watch         1278
+#define __NR_inotify_rm_watch          1279
 
 #ifdef __KERNEL__
 
@@ -378,8 +383,6 @@ struct sigaction;
 long sys_execve(char __user *filename, char __user * __user *argv,
                           char __user * __user *envp, struct pt_regs *regs);
 asmlinkage long sys_pipe(void);
-asmlinkage long sys_ptrace(long request, pid_t pid,
-                          unsigned long addr, unsigned long data);
 asmlinkage long sys_rt_sigaction(int sig,
                                 const struct sigaction __user *act,
                                 struct sigaction __user *oact,