diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
commit | 25f73891c3059e9ce6ff0a02670aa98baf6cbce9 (patch) | |
tree | 18a2ef934aa353ca695c3faaa3b7497fea22037a /arch/powerpc/platforms/cell/spu_callbacks.c | |
parent | fef6108d4556917c45cd9ba397c1c7597f3990e1 (diff) | |
parent | 4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff) | |
download | linux-25f73891c3059e9ce6ff0a02670aa98baf6cbce9.tar.bz2 |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/powerpc/platforms/cell/spu_callbacks.c')
-rw-r--r-- | arch/powerpc/platforms/cell/spu_callbacks.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c index 6594bec73882..deb3afb94484 100644 --- a/arch/powerpc/platforms/cell/spu_callbacks.c +++ b/arch/powerpc/platforms/cell/spu_callbacks.c @@ -317,17 +317,16 @@ void *spu_syscall_table[] = { [__NR_ppoll] sys_ni_syscall, /* sys_ppoll */ [__NR_unshare] sys_unshare, [__NR_splice] sys_splice, + [__NR_tee] sys_tee, }; long spu_sys_callback(struct spu_syscall_block *s) { long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6); - BUILD_BUG_ON(ARRAY_SIZE(spu_syscall_table) != __NR_syscalls); - syscall = spu_syscall_table[s->nr_ret]; - if (s->nr_ret >= __NR_syscalls) { + if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) { pr_debug("%s: invalid syscall #%ld", __FUNCTION__, s->nr_ret); return -ENOSYS; } |