Commit 21b4da78 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[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: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 418aade4
...@@ -195,9 +195,6 @@ sys32_sigaction(int sig, const struct old_sigaction32 __user *act, ...@@ -195,9 +195,6 @@ sys32_sigaction(int sig, const struct old_sigaction32 __user *act,
return ret; return ret;
} }
int
do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
asmlinkage long asmlinkage long
sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
struct sigaction32 __user *oact, size_t sigsetsize) struct sigaction32 __user *oact, size_t sigsetsize)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment