aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-02-10 16:27:11 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-10 13:43:59 -0800
commit21b4da78c941f292f6daf87abb562d6285216e51 (patch)
tree705d38a01494000d3f7a1071f90870100730708a
parent418aade459f03318defd18ef0b11981a63bd81b0 (diff)
downloadlinux-2.6.34-ux500-21b4da78c941f292f6daf87abb562d6285216e51.tar.gz
[PATCH] Fix s390 build failure.
arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction' include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/s390/kernel/compat_signal.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index ef706694a0c..5291b5f8788 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -195,9 +195,6 @@ sys32_sigaction(int sig, const struct old_sigaction32 __user *act,
return ret;
}
-int
-do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
-
asmlinkage long
sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
struct sigaction32 __user *oact, size_t sigsetsize)