diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-12-13 21:23:37 -0500 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2018-03-29 16:15:12 -0400 |
commit | 530ba6c7cb3c22435a4d26de47037bb6f86a5329 (patch) | |
tree | 0bceed03e1e4abd9fb15f44e8b4787f1d1d52c15 /arch/um | |
parent | 584bfe635481d9b2b7f181b05a84d6cfdce79ee7 (diff) |
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.c | 1 | ||||
-rw-r--r-- | arch/um/os-Linux/signal.c | 1 |
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 @@ | |||
12 | #include <sys/mount.h> | 12 | #include <sys/mount.h> |
13 | #include <sys/socket.h> | 13 | #include <sys/socket.h> |
14 | #include <sys/stat.h> | 14 | #include <sys/stat.h> |
15 | #include <sys/sysmacros.h> | ||
15 | #include <sys/un.h> | 16 | #include <sys/un.h> |
16 | #include <sys/types.h> | 17 | #include <sys/types.h> |
17 | #include <os.h> | 18 | #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 @@ | |||
16 | #include <os.h> | 16 | #include <os.h> |
17 | #include <sysdep/mcontext.h> | 17 | #include <sysdep/mcontext.h> |
18 | #include <um_malloc.h> | 18 | #include <um_malloc.h> |
19 | #include <sys/ucontext.h> | ||
19 | 20 | ||
20 | void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = { | 21 | void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = { |
21 | [SIGTRAP] = relay_signal, | 22 | [SIGTRAP] = relay_signal, |