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

Commit 603c4612 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paul Mackerras
Browse files

[POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again 



The commit 8b6f50ef seems to have
been affected by a mismerge of a duplicate patch
(d054b36f) - 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: default avatarJeremy Kerr <jk@ozlabs.org>
Acked-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 474f8196

arch/powerpc/platforms/cell/spufs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -2177,8 +2177,8 @@ struct tree_descr spufs_dir_contents[] = { 
	{ "mbox_stat", &spufs_mbox_stat_fops, 0444, },

	{ "ibox_stat", &spufs_ibox_stat_fops, 0444, },

	{ "wbox_stat", &spufs_wbox_stat_fops, 0444, },

	{ "signal1", &spufs_signal1_nosched_fops, 0222, },

	{ "signal2", &spufs_signal2_nosched_fops, 0222, },

	{ "signal1", &spufs_signal1_fops, 0666, },

	{ "signal2", &spufs_signal2_fops, 0666, },

	{ "signal1_type", &spufs_signal1_type, 0666, },

	{ "signal2_type", &spufs_signal2_type, 0666, },

	{ "cntl", &spufs_cntl_fops,  0666, },