Fix ppc64 mismerge
Fix a mismerge in commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10: "spufs: make signal-notification files readonly for NOSCHED contexts", where structs got duplicated. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
d7fff6f4d1
Коммит
5fa63fccc5
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче