Skip to contentSkip to conversation

ppc64 mismerge

PATCH In review Al Viro 2 participants 2 messages Jul 22, 2007

Subsystems (3)
PowerPC Cell broadband engine architecture SPU file system
lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 ppc64 mismerge

Mismerge in
commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10

Author: Jeremy Kerr <[email protected]>
Date:   Sat Jul 21 04:37:51 2007 -0700

spufs: make signal-notification files readonly for NOSCHED contexts

structs got duplicated.

Signed-off-by Al Viro <[email protected]>

---

arch/powerpc/platforms/cell/spufs/file.c +0 -14
index c2aaec5..4100ddc 100644
@@ -941,13 +941,6 @@ static const struct file_operations spufs_signal1_nosched_fops = {
 	.mmap = spufs_signal1_mmap,
 };
 
-static const struct file_operations spufs_signal1_nosched_fops = {
-	.open = spufs_signal1_open,
-	.release = spufs_signal1_release,
-	.write = spufs_signal1_write,
-	.mmap = spufs_signal1_mmap,
-};
-
 static int spufs_signal2_open(struct inode *inode, struct file *file)
 {
 	struct spufs_inode_info *i = SPUFS_I(inode);

@@ -1083,13 +1076,6 @@ static const struct file_operations spufs_signal2_nosched_fops = {
 	.mmap = spufs_signal2_mmap,
 };
 
-static const struct file_operations spufs_signal2_nosched_fops = {
-	.open = spufs_signal2_open,
-	.release = spufs_signal2_release,
-	.write = spufs_signal2_write,
-	.mmap = spufs_signal2_mmap,
-};
-
 static void spufs_signal1_type_set(void *data, u64 val)
 {
 	struct spu_context *ctx = data;