mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
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
This commit is contained in:
commit
aa9d40de77
@ -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, },
|
||||||
|
Loading…
Reference in New Issue
Block a user