Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23b2527d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

[PATCH] powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_table 



Every time a new syscall gets added, a BUILD_BUG_ON in
arch/powerpc/platforms/cell/spu_callbacks.c gets triggered.
Since the addition of a new syscall is rather harmless,
the error should just be removed.

While we're here, add sys_tee to the list and add a comment
to systbl.S to remind people that there is another list
on powerpc.

Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 60162e49

arch/powerpc/kernel/systbl.S

+5 −0
Original line number Diff line number Diff line
@@ -324,3 +324,8 @@ COMPAT_SYS(ppoll) 
SYSCALL(unshare)

SYSCALL(splice)

SYSCALL(tee)



/*

 * please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c

 * as well when appropriate.

 */

arch/powerpc/platforms/cell/spu_callbacks.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

	}