summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/ia32_unistd.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-01-12 23:47:08 +0100
committerSteve French <sfrench@us.ibm.com>2006-01-12 23:47:08 +0100
commit94bc2be31a01a3055ec94176e595dfe208e92d3b (patch)
treeebfbe81c6718a6390bfa1b99c6d228237d818576 /include/asm-x86_64/ia32_unistd.h
parent[CIFS] Allow local filesize for file that is open for write to be updated (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (diff)
downloadlinux-94bc2be31a01a3055ec94176e595dfe208e92d3b.tar.xz
linux-94bc2be31a01a3055ec94176e595dfe208e92d3b.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-x86_64/ia32_unistd.h')
-rw-r--r--include/asm-x86_64/ia32_unistd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86_64/ia32_unistd.h b/include/asm-x86_64/ia32_unistd.h
index d5166ec3868d..e8843362a6cc 100644
--- a/include/asm-x86_64/ia32_unistd.h
+++ b/include/asm-x86_64/ia32_unistd.h
@@ -299,7 +299,8 @@
#define __NR_ia32_inotify_init 291
#define __NR_ia32_inotify_add_watch 292
#define __NR_ia32_inotify_rm_watch 293
+#define __NR_ia32_migrate_pages 294
-#define IA32_NR_syscalls 294 /* must be > than biggest syscall! */
+#define IA32_NR_syscalls 295 /* must be > than biggest syscall! */
#endif /* _ASM_X86_64_IA32_UNISTD_H_ */