* [PATCH] arch/um: compile with modern headers
@ 2017-12-13 17:22 Jason A. Donenfeld
2017-12-13 20:41 ` Richard Weinberger
0 siblings, 1 reply; 3+ messages in thread
From: Jason A. Donenfeld @ 2017-12-13 17:22 UTC (permalink / raw)
To: linux-kernel, jdike, richard, user-mode-linux-devel
Cc: Jason A. Donenfeld, stable
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
---
arch/um/os-Linux/file.c | 1 +
arch/um/os-Linux/signal.c | 3 ++-
arch/x86/um/stub_segv.c | 3 ++-
3 files changed, 5 insertions(+), 2 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 a86d7cc2c2d8..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,
@@ -159,7 +160,7 @@ static void (*handlers[_NSIG])(int sig, struct siginfo *si, mcontext_t *mc) = {
static void hard_handler(int sig, siginfo_t *si, void *p)
{
- struct ucontext *uc = p;
+ ucontext_t *uc = p;
mcontext_t *mc = &uc->uc_mcontext;
unsigned long pending = 1UL << sig;
diff --git a/arch/x86/um/stub_segv.c b/arch/x86/um/stub_segv.c
index 1518d2805ae8..27361cbb7ca9 100644
--- a/arch/x86/um/stub_segv.c
+++ b/arch/x86/um/stub_segv.c
@@ -6,11 +6,12 @@
#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)
{
- struct ucontext *uc = p;
+ ucontext_t *uc = p;
GET_FAULTINFO_FROM_MC(*((struct faultinfo *) STUB_DATA),
&uc->uc_mcontext);
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arch/um: compile with modern headers
2017-12-13 17:22 [PATCH] arch/um: compile with modern headers Jason A. Donenfeld
@ 2017-12-13 20:41 ` Richard Weinberger
2017-12-14 2:23 ` Jason A. Donenfeld
0 siblings, 1 reply; 3+ messages in thread
From: Richard Weinberger @ 2017-12-13 20:41 UTC (permalink / raw)
To: Jason A. Donenfeld; +Cc: linux-kernel, jdike, user-mode-linux-devel, stable
Jason,
Am Mittwoch, 13. Dezember 2017, 18:22:30 CET schrieb Jason A. Donenfeld:
> 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
> ---
> arch/um/os-Linux/file.c | 1 +
> arch/um/os-Linux/signal.c | 3 ++-
> arch/x86/um/stub_segv.c | 3 ++-
> 3 files changed, 5 insertions(+), 2 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 a86d7cc2c2d8..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,
> @@ -159,7 +160,7 @@ static void (*handlers[_NSIG])(int sig, struct siginfo
> *si, mcontext_t *mc) = {
>
> static void hard_handler(int sig, siginfo_t *si, void *p)
> {
> - struct ucontext *uc = p;
> + ucontext_t *uc = p;
> mcontext_t *mc = &uc->uc_mcontext;
> unsigned long pending = 1UL << sig;
>
> diff --git a/arch/x86/um/stub_segv.c b/arch/x86/um/stub_segv.c
> index 1518d2805ae8..27361cbb7ca9 100644
> --- a/arch/x86/um/stub_segv.c
> +++ b/arch/x86/um/stub_segv.c
> @@ -6,11 +6,12 @@
> #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)
> {
> - struct ucontext *uc = p;
> + ucontext_t *uc = p;
>
> GET_FAULTINFO_FROM_MC(*((struct faultinfo *) STUB_DATA),
> &uc->uc_mcontext);
Can you please rebase your fix on linux-next?
I have already a very similar fix in the pipe.
Thanks,
//richard
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] arch/um: compile with modern headers
2017-12-13 20:41 ` Richard Weinberger
@ 2017-12-14 2:23 ` Jason A. Donenfeld
0 siblings, 0 replies; 3+ messages in thread
From: Jason A. Donenfeld @ 2017-12-14 2:23 UTC (permalink / raw)
To: linux-kernel, jdike, richard, user-mode-linux-devel
Cc: Jason A. Donenfeld, stable
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
---
Rebased on linux-next, by request.
arch/um/os-Linux/file.c | 1 +
arch/um/os-Linux/signal.c | 1 +
arch/x86/um/stub_segv.c | 1 +
3 files changed, 3 insertions(+)
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,
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.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-14 2:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-13 17:22 [PATCH] arch/um: compile with modern headers Jason A. Donenfeld
2017-12-13 20:41 ` Richard Weinberger
2017-12-14 2:23 ` Jason A. Donenfeld
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).