OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
474f819
)
[POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again
author
Jeremy Kerr
<jk@ozlabs.org>
Wed, 26 Sep 2007 00:53:45 +0000
(10:53 +1000)
committer
Paul Mackerras
<paulus@samba.org>
Wed, 26 Sep 2007 09:47:07 +0000
(19:47 +1000)
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>
arch/powerpc/platforms/cell/spufs/file.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/platforms/cell/spufs/file.c
b/arch/powerpc/platforms/cell/spufs/file.c
index
4100ddc
..
7de4e91
100644
(file)
--- 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, },