[PATCH 0/2] um: fix minor build failures

[PATCH 0/2] um: fix minor build failures

[Sergei Trofimovich]

Hia Linus!

Sending build fixes directly as Richard is busy now
and UML fails to build for quite a while.

Thanks!

[PATCH 1/2] um: add missing declaration of 'getrlimit()' and friends

[Sergei Trofimovich]

From: Sergei Trofimovich <slyfox@gentoo.org>

arch/um/os-Linux/start_up.c: In function 'check_coredump_limit':
arch/um/os-Linux/start_up.c:338:16: error: storage size of 'lim' isn't known
arch/um/os-Linux/start_up.c:339:2: error: implicit declaration of function 'getrlimit' [-Werror=implicit-function-declaration]

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 arch/um/os-Linux/start_up.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index da4b9e9..337518c 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -15,6 +15,8 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <asm/unistd.h>
 #include <init.h>
 #include <os.h>
-- 
1.8.1.2

[PATCH 2/2] um: fix build failure due to mess-up of sig_info protorype

[Sergei Trofimovich]

From: Sergei Trofimovich <slyfox@gentoo.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 <slyfox@gentoo.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.1.2

[PATCH 1/2] um: add missing declaration of 'getrlimit()' and friends

[Sergei Trofimovich]

arch/um/os-Linux/start_up.c: In function 'check_coredump_limit':
arch/um/os-Linux/start_up.c:338:16: error: storage size of 'lim' isn't known
arch/um/os-Linux/start_up.c:339:2: error: implicit declaration of function 'getrlimit' [-Werror=implicit-function-declaration]

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
CC: Jeff Dike <jdike@addtoit.com>
CC: Richard Weinberger <richard@nod.at>
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
---
 arch/um/os-Linux/start_up.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index da4b9e9..337518c 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -15,6 +15,8 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <asm/unistd.h>
 #include <init.h>
 #include <os.h>
-- 
1.8.0.2

[PATCH 2/2] um: fix build failure due to mess-up of sig_info protorype

[Sergei Trofimovich]

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
---
 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

Re: [PATCH 2/2] um: fix build failure due to mess-up of sig_info protorype

[Richard Weinberger]

Am Sun, 30 Dec 2012 01:37:31 +0300
schrieb Sergei Trofimovich <slyfox@gentoo.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 <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
> ---

I think both patches need to be backported to -stable.
I'll add the tag and push the patches ASAP to Linus.

Thanks,
//richard

Re: [PATCH 2/2] um: fix build failure due to mess-up of sig_info protorype

[Sergei Trofimovich]

[-- Attachment #1: Type: text/plain, Size: 1001 bytes --]

On Sun, 30 Dec 2012 10:40:43 +0100
Richard Weinberger <richard@nod.at> wrote:

> Am Sun, 30 Dec 2012 01:37:31 +0300
> schrieb Sergei Trofimovich <slyfox@gentoo.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 <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
> > ---
> 
> I think both patches need to be backported to -stable.
> I'll add the tag and push the patches ASAP to Linus.

Seems to have got lost.

-- 

  Sergei

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 2/2] um: fix build failure due to mess-up of sig_info protorype

[Richard Weinberger]

Am Sat, 12 Jan 2013 00:55:17 +0300
schrieb Sergei Trofimovich <slyfox@gentoo.org>:

> On Sun, 30 Dec 2012 10:40:43 +0100
> Richard Weinberger <richard@nod.at> wrote:
> 
> > Am Sun, 30 Dec 2012 01:37:31 +0300
> > schrieb Sergei Trofimovich <slyfox@gentoo.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 <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
> > > ---
> > 
> > I think both patches need to be backported to -stable.
> > I'll add the tag and push the patches ASAP to Linus.
> 
> Seems to have got lost.

Yeah. Sorry for that. I'm currently very busy.
This weekend I'll have some time to prepare all my patches.

Thanks,
//richard