From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753679Ab2L2WiU (ORCPT ); Sat, 29 Dec 2012 17:38:20 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:54156 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753420Ab2L2WiR (ORCPT ); Sat, 29 Dec 2012 17:38:17 -0500 From: Sergei Trofimovich Cc: Sergei Trofimovich , Jeff Dike , Richard Weinberger , =?UTF-8?q?Martin=20P=C3=A4rtel?= , Al Viro , user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: =?UTF-8?q?=5BPATCH=202/2=5D=20um=3A=20fix=20build=20failure=20due=20to=20mess-up=20of=20sig=5Finfo=20protorype?= Date: Sun, 30 Dec 2012 01:37:31 +0300 Message-Id: <1356820651-8495-2-git-send-email-slyfox@gentoo.org> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1356820651-8495-1-git-send-email-slyfox@gentoo.org> References: <1356820651-8495-1-git-send-email-slyfox@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 CC: Jeff Dike CC: Richard Weinberger CC: "Martin Pärtel" CC: Al Viro CC: user-mode-linux-devel@lists.sourceforge.net CC: user-mode-linux-user@lists.sourceforge.net CC: linux-kernel@vger.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 #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