]>
Commit | Line | Data |
---|---|---|
f85a50aa GKH |
1 | From 530ba6c7cb3c22435a4d26de47037bb6f86a5329 Mon Sep 17 00:00:00 2001 |
2 | From: "Jason A. Donenfeld" <Jason@zx2c4.com> | |
3 | Date: Thu, 14 Dec 2017 03:23:37 +0100 | |
4 | Subject: um: Compile with modern headers | |
5 | ||
6 | From: Jason A. Donenfeld <Jason@zx2c4.com> | |
7 | ||
8 | commit 530ba6c7cb3c22435a4d26de47037bb6f86a5329 upstream. | |
9 | ||
10 | Recent libcs have gotten a bit more strict, so we actually need to | |
11 | include the right headers and use the right types. This enables UML to | |
12 | compile again. | |
13 | ||
14 | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> | |
15 | Cc: stable@vger.kernel.org | |
16 | Signed-off-by: Richard Weinberger <richard@nod.at> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | ||
19 | --- | |
20 | arch/um/os-Linux/file.c | 1 + | |
21 | arch/um/os-Linux/signal.c | 1 + | |
22 | arch/x86/um/stub_segv.c | 1 + | |
23 | 3 files changed, 3 insertions(+) | |
24 | ||
25 | --- a/arch/um/os-Linux/file.c | |
26 | +++ b/arch/um/os-Linux/file.c | |
27 | @@ -12,6 +12,7 @@ | |
28 | #include <sys/mount.h> | |
29 | #include <sys/socket.h> | |
30 | #include <sys/stat.h> | |
31 | +#include <sys/sysmacros.h> | |
32 | #include <sys/un.h> | |
33 | #include <sys/types.h> | |
34 | #include <os.h> | |
35 | --- a/arch/um/os-Linux/signal.c | |
36 | +++ b/arch/um/os-Linux/signal.c | |
37 | @@ -16,6 +16,7 @@ | |
38 | #include <os.h> | |
39 | #include <sysdep/mcontext.h> | |
40 | #include <um_malloc.h> | |
41 | +#include <sys/ucontext.h> | |
42 | ||
43 | void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = { | |
44 | [SIGTRAP] = relay_signal, | |
45 | --- a/arch/x86/um/stub_segv.c | |
46 | +++ b/arch/x86/um/stub_segv.c | |
47 | @@ -6,6 +6,7 @@ | |
48 | #include <sysdep/stub.h> | |
49 | #include <sysdep/faultinfo.h> | |
50 | #include <sysdep/mcontext.h> | |
51 | +#include <sys/ucontext.h> | |
52 | ||
53 | void __attribute__ ((__section__ (".__syscall_stub"))) | |
54 | stub_segv_handler(int sig, siginfo_t *info, void *p) |