summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-12-30 01:37:31 +0300
committerRichard Weinberger <richard@nod.at>2013-03-11 10:08:03 +0100
commit72383d43b223c410fc61d9e905690b9b9ba9d418 (patch)
tree12d6906f1c850e1f9f679d867e7d55f2ea423587 /arch/um
parentfdfa4c952844fce881df8c76de9c7180cbe913ab (diff)
downloadlinux-72383d43b223c410fc61d9e905690b9b9ba9d418.tar.gz
linux-72383d43b223c410fc61d9e905690b9b9ba9d418.tar.bz2
linux-72383d43b223c410fc61d9e905690b9b9ba9d418.zip
um: fix build failure due to mess-up of sig_info protorype
arch/um/os-Linux/signal.c:18:8: error: conflicting types for 'sig_info' In file included from /home/slyfox/linux-2.6/arch/um/os-Linux/signal.c:12:0: arch/um/include/shared/as-layout.h:64:15: note: previous declaration of 'sig_info' was here Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> CC: Jeff Dike <jdike@addtoit.com> CC: Richard Weinberger <richard@nod.at> CC: "Martin Pärtel" <martin.partel@gmail.com> CC: Al Viro <viro@zeniv.linux.org.uk> CC: user-mode-linux-devel@lists.sourceforge.net CC: user-mode-linux-user@lists.sourceforge.net CC: linux-kernel@vger.kernel.org Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/os-Linux/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index b1469fe93295..9d9f1b4bf826 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -15,7 +15,7 @@
#include <sysdep/mcontext.h>
#include "internal.h"
-void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *) = {
+void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
[SIGTRAP] = relay_signal,
[SIGFPE] = relay_signal,
[SIGILL] = relay_signal,