[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1356820651-8495-2-git-send-email-slyfox@gentoo.org>
Date: Sun, 30 Dec 2012 01:37:31 +0300
From: Sergei Trofimovich <slyfox@...too.org>
To: unlisted-recipients:; (no To-header on input)
Cc: Sergei Trofimovich <slyfox@...too.org>,
Jeff Dike <jdike@...toit.com>,
Richard Weinberger <richard@....at>,
Martin Pärtel <martin.partel@...il.com>,
Al Viro <viro@...iv.linux.org.uk>,
user-mode-linux-devel@...ts.sourceforge.net,
user-mode-linux-user@...ts.sourceforge.net,
linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] 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@...too.org>
CC: Jeff Dike <jdike@...toit.com>
CC: Richard Weinberger <richard@....at>
CC: "Martin Pärtel" <martin.partel@...il.com>
CC: Al Viro <viro@...iv.linux.org.uk>
CC: user-mode-linux-devel@...ts.sourceforge.net
CC: user-mode-linux-user@...ts.sourceforge.net
CC: linux-kernel@...r.kernel.org
---
arch/um/os-Linux/signal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index b1469fe..9d9f1b4 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,
--
1.8.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists