summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/unistd.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2006-04-29 02:42:26 +0200
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-29 02:42:26 +0200
commitd6754b401a15eaa16492ea5dbaa4826361d3f411 (patch)
tree032f067d3af458527d903a7653885404ed82431e /include/asm-powerpc/unistd.h
parentlinux/blkpg.h needs <linux/compiler.h> for __user (diff)
parent[PATCH] slab: fix crash on __drain_alien_cahce() during CPU Hotplug (diff)
downloadlinux-d6754b401a15eaa16492ea5dbaa4826361d3f411.tar.xz
linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-powerpc/unistd.h')
-rw-r--r--include/asm-powerpc/unistd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index d471549e1b81..ef932f1cddc3 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -303,8 +303,9 @@
#define __NR_unshare 282
#define __NR_splice 283
#define __NR_tee 284
+#define __NR_vmsplice 285
-#define __NR_syscalls 285
+#define __NR_syscalls 286
#ifdef __KERNEL__
#define __NR__exit __NR_exit