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

Commit aa9d40de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again
parents d85f5793 603c4612

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

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

	{ "mbox_stat", &spufs_mbox_stat_fops, 0444, },

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

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

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

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

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

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

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

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

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

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

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

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

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

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