um: fix minor build failures
Subsystems (2)
cover um: fix minor build failures
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
From: Sergei Trofimovich <[email protected]>
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]
--- arch/um/os-Linux/start_up.c | 2 ++ 1 file changed, 2 insertions(+)
arch/um/os-Linux/start_up.c +2 -0
@@ -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>
Signature · 1 line
1.8.1.2
PATCH 2/2 um: fix build failure due to mess-up of sig_info protorype
In reply to Sergei TrofimovichFrom: Sergei Trofimovich <[email protected]>
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
--- arch/um/os-Linux/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/os-Linux/signal.c +1 -1
@@ -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,
Signature · 1 line
1.8.1.2