Commit 9c0c5b93 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Stefan Bader

um: Compile with modern headers

BugLink: https://bugs.launchpad.net/bugs/1836668

commit 530ba6c7 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: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarAlessio Balsini <balsini@android.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 53d4c4e0
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/sysmacros.h>
#include <sys/un.h> #include <sys/un.h>
#include <sys/types.h> #include <sys/types.h>
#include <os.h> #include <os.h>
......
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
#include <as-layout.h> #include <as-layout.h>
#include <kern_util.h> #include <kern_util.h>
#include <os.h> #include <os.h>
#include <sys/ucontext.h>
#include <sysdep/mcontext.h> #include <sysdep/mcontext.h>
#include <um_malloc.h>
void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = { void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
[SIGTRAP] = relay_signal, [SIGTRAP] = relay_signal,
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <sysdep/stub.h> #include <sysdep/stub.h>
#include <sysdep/faultinfo.h> #include <sysdep/faultinfo.h>
#include <sysdep/mcontext.h> #include <sysdep/mcontext.h>
#include <sys/ucontext.h>
void __attribute__ ((__section__ (".__syscall_stub"))) void __attribute__ ((__section__ (".__syscall_stub")))
stub_segv_handler(int sig, siginfo_t *info, void *p) stub_segv_handler(int sig, siginfo_t *info, void *p)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment