diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 09:00:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 09:00:04 -0700 |
| commit | aa9d40de77f8ec734f48d0be0c7fe7732d505af4 (patch) | |
| tree | c505e514944b73c604aaef15e01d39ada076fc98 | |
| parent | d85f57938ad1d674dff8077a2e6a36a45dbe0e22 (diff) | |
| parent | 603c461250b223ac42c10b8d1df653af1a361d44 (diff) | |
| download | linux-stable-aa9d40de77f8ec734f48d0be0c7fe7732d505af4.tar.gz linux-stable-aa9d40de77f8ec734f48d0be0c7fe7732d505af4.tar.bz2 linux-stable-aa9d40de77f8ec734f48d0be0c7fe7732d505af4.zip | |
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
| -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 4100ddc52f02..7de4e919687b 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, }, |