* [PATCH 4.4] um: Compile with modern headers
@ 2019-07-03 9:46 Alessio Balsini
2019-07-03 12:11 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Alessio Balsini @ 2019-07-03 9:46 UTC (permalink / raw)
To: gregkh; +Cc: astrachan, maennich, kernel-team, stable, linux-kernel
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
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 <Jason@zx2c4.com>
Cc: stable@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Alessio Balsini <balsini@android.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4.4] um: Compile with modern headers
2019-07-03 9:46 [PATCH 4.4] um: Compile with modern headers Alessio Balsini
@ 2019-07-03 12:11 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2019-07-03 12:11 UTC (permalink / raw)
To: Alessio Balsini; +Cc: astrachan, maennich, kernel-team, stable, linux-kernel
On Wed, Jul 03, 2019 at 10:46:27AM +0100, Alessio Balsini wrote:
> From: "Jason A. Donenfeld" <Jason@zx2c4.com>
>
> 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 <Jason@zx2c4.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> Signed-off-by: Alessio Balsini <balsini@android.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-03 12:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-03 9:46 [PATCH 4.4] um: Compile with modern headers Alessio Balsini
2019-07-03 12:11 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).