Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5fa63fccc579ac609fc7f86d29ccb3a2edf910d7
Commit: 5fa63fccc579ac609fc7f86d29ccb3a2edf910d7
Parent: d7fff6f4d1ed1bc31577df887fefcb1541923367
Author: Al Viro <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 22 08:10:35 2007 +0100
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Jul 22 10:41:27 2007 -0700
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 <[EMAIL PROTECTED]>
Acked-by: Jeremy Kerr <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
arch/powerpc/platforms/cell/spufs/file.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/arch/powerpc/platforms/cell/spufs/file.c
b/arch/powerpc/platforms/cell/spufs/file.c
index c2aaec5..4100ddc 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
