]> err.no Git - linux-2.6/commit
[POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again
authorJeremy Kerr <jk@ozlabs.org>
Wed, 26 Sep 2007 00:53:45 +0000 (10:53 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 26 Sep 2007 09:47:07 +0000 (19:47 +1000)
commit603c461250b223ac42c10b8d1df653af1a361d44
tree2705395003917a3560851ca2f75b32021d69b8d2
parent474f81967217f3bec2389ae913da72641f2c40e3
[POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again

The commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10 seems to have
been affected by a mismerge of a duplicate patch
(d054b36ffd302ec65aabec16a0c60ddd9e6b5a62) - both the
spufs_dir_contents and spufs_dir_nosched_contents have been given
write-only signal notification files.

This change reverts the spufs_dir_contents array to use the
readable signal notification file implementation.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/cell/spufs/file.c