Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-microblaze.git] / include / asm-i386 / unistd.h

diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 0f92e78..481c3c0 100644 (file)
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -256,7 +256,7 @@
 #define __NR_io_submit         248
 #define __NR_io_cancel         249
 #define __NR_fadvise64         250
-#define __NR_set_zone_reclaim  251
+/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
 #define __NR_exit_group                252
 #define __NR_lookup_dcookie    253
 #define __NR_epoll_create      254
@@ -299,8 +299,9 @@
 #define __NR_inotify_init      291
 #define __NR_inotify_add_watch 292
 #define __NR_inotify_rm_watch  293
+#define __NR_migrate_pages     294
 
-#define NR_syscalls 294
+#define NR_syscalls 295
 
 /*
  * user-visible error numbers are in the range -1 - -128: see