summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-12-14 03:23:37 +0100
committerRichard Weinberger <richard@nod.at>2018-03-29 22:15:12 +0200
commit530ba6c7cb3c22435a4d26de47037bb6f86a5329 (patch)
tree0bceed03e1e4abd9fb15f44e8b4787f1d1d52c15 /arch/um
parent584bfe635481d9b2b7f181b05a84d6cfdce79ee7 (diff)
downloadlinux-stable-530ba6c7cb3c22435a4d26de47037bb6f86a5329.tar.gz
linux-stable-530ba6c7cb3c22435a4d26de47037bb6f86a5329.tar.bz2
linux-stable-530ba6c7cb3c22435a4d26de47037bb6f86a5329.zip
um: Compile with modern headers
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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/os-Linux/file.c1
-rw-r--r--arch/um/os-Linux/signal.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 2db18cbbb0ea..c0197097c86e 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 a5c0c909c48b..bf0acb8aad8b 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -16,6 +16,7 @@
#include <os.h>
#include <sysdep/mcontext.h>
#include <um_malloc.h>
+#include <sys/ucontext.h>
void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
[SIGTRAP] = relay_signal,