Fix ppc64 mismerge

Browse source

Fix a mismerge in commit 8b6f50ef1d:
"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:

Al Viro 2007-07-22 08:10:35 +01:00 • committed by Linus Torvalds

parent d7fff6f4d1

commit 5fa63fccc5

1 changed files with 0 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

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

View file