34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
commit 72383d43b223c410fc61d9e905690b9b9ba9d418
|
||
|
|
Author: Sergei Trofimovich <slyfox@gentoo.org>
|
||
|
|
Date: Sun Dec 30 01:37:31 2012 +0300
|
||
|
|
|
||
|
|
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>
|
||
|
|
|
||
|
|
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
|
||
|
|
index b1469fe..9d9f1b4 100644
|
||
|
|
--- arch/um/os-Linux/signal.c
|
||
|
|
+++ 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,
|