]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] Fix s390 build failure.
authorDave Jones <davej@redhat.com>
Fri, 10 Feb 2006 21:27:11 +0000 (16:27 -0500)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 21:43:59 +0000 (13:43 -0800)
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>
arch/s390/kernel/compat_signal.c

index ef706694a0c1d3897ab28330576901214d8d3a62..5291b5f8788db723d8464483d1fafaccd9d3ac7c 100644 (file)
@@ -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)