2019-07-03 09:47:51

by Alessio Balsini

Subject: [PATCH 4.4] um: Compile with modern headers

From: "Jason A. Donenfeld" <[email protected]>

commit 530ba6c7cb3c22435a4d26de47037bb6f86a5329 upstream.

Recent libcs have gotten a bit more strict, so we actually need to
include the right headers and use the right types. This enables UML to
compile again.

Signed-off-by: Jason A. Donenfeld <[email protected]>
Cc: [email protected]
Signed-off-by: Richard Weinberger <[email protected]>
Signed-off-by: Alessio Balsini <[email protected]>
---
arch/um/os-Linux/file.c | 1 +
arch/um/os-Linux/signal.c | 2 ++
arch/x86/um/stub_segv.c | 1 +
3 files changed, 4 insertions(+)

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 26e0164895e4..6e6f6d28d54b 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -12,6 +12,7 @@
#include <sys/mount.h>
#include <sys/socket.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <sys/un.h>
#include <sys/types.h>
#include <os.h>
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 56648f4f8b41..5da50451d372 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -14,7 +14,9 @@
#include <as-layout.h>
#include <kern_util.h>
#include <os.h>
+#include <sys/ucontext.h>
#include <sysdep/mcontext.h>
+#include <um_malloc.h>

void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
[SIGTRAP] = relay_signal,
diff --git a/arch/x86/um/stub_segv.c b/arch/x86/um/stub_segv.c
index fd6825537b97..27361cbb7ca9 100644
--- a/arch/x86/um/stub_segv.c
+++ b/arch/x86/um/stub_segv.c
@@ -6,6 +6,7 @@
#include <sysdep/stub.h>
#include <sysdep/faultinfo.h>
#include <sysdep/mcontext.h>
+#include <sys/ucontext.h>

void __attribute__ ((__section__ (".__syscall_stub")))
stub_segv_handler(int sig, siginfo_t *info, void *p)
--
2.22.0.410.gd8fdbe21b5-goog

2019-07-03 12:12:15

by Greg Kroah-Hartman

Subject: Re: [PATCH 4.4] um: Compile with modern headers

On Wed, Jul 03, 2019 at 10:46:27AM +0100, Alessio Balsini wrote:
> From: "Jason A. Donenfeld" <[email protected]>
>
> commit 530ba6c7cb3c22435a4d26de47037bb6f86a5329 upstream.
>
> Recent libcs have gotten a bit more strict, so we actually need to
> include the right headers and use the right types. This enables UML to
> compile again.
>
> Signed-off-by: Jason A. Donenfeld <[email protected]>
> Cc: [email protected]
> Signed-off-by: Richard Weinberger <[email protected]>
> Signed-off-by: Alessio Balsini <[email protected]>
> ---
> arch/um/os-Linux/file.c | 1 +
> arch/um/os-Linux/signal.c | 2 ++
> arch/x86/um/stub_segv.c | 1 +
> 3 files changed, 4 insertions(+)

Thanks for this, now applied.

greg k-h