aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-26 07:47:55 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-26 07:47:55 -0700
commit7b97ebfb931887be63bfa29b6c143e9e9da3f5e8 (patch)
treefaaf77f68ef4192ac1a3c23f43fed122a080d341 /arch/powerpc/kernel
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff)
parent[PATCH] splice: add ->splice_write support for /dev/null (diff)
downloadwireguard-linux-7b97ebfb931887be63bfa29b6c143e9e9da3f5e8.tar.xz
wireguard-linux-7b97ebfb931887be63bfa29b6c143e9e9da3f5e8.zip
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] splice: add ->splice_write support for /dev/null [PATCH] splice: rearrange moving to/from pipe helpers [PATCH] Add support for the sys_vmsplice syscall [PATCH] splice: fix offset problems [PATCH] splice: fix min() warning
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/systbl.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index 8d1522690501..0b98eea73c5e 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -324,6 +324,7 @@ COMPAT_SYS(ppoll)
SYSCALL(unshare)
SYSCALL(splice)
SYSCALL(tee)
+SYSCALL(vmsplice)
/*
* please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c