diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2007-09-26 10:53:45 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-26 19:47:07 +1000 |
| commit | 603c461250b223ac42c10b8d1df653af1a361d44 (patch) | |
| tree | 2705395003917a3560851ca2f75b32021d69b8d2 /arch/powerpc | |
| parent | 474f81967217f3bec2389ae913da72641f2c40e3 (diff) | |
| download | linux-3.10-603c461250b223ac42c10b8d1df653af1a361d44.tar.gz linux-3.10-603c461250b223ac42c10b8d1df653af1a361d44.tar.bz2 linux-3.10-603c461250b223ac42c10b8d1df653af1a361d44.zip | |
[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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index 4100ddc52f0..7de4e919687 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c @@ -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, }, |