Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fa63fcc authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

Fix ppc64 mismerge 



Fix a mismerge in commit 8b6f50ef:
"spufs: make signal-notification files readonly for NOSCHED contexts",
where structs got duplicated.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7fff6f4

arch/powerpc/platforms/cell/spufs/file.c

+0 −14
Original line number Diff line number Diff line
@@ -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;