[PATCH] uml: Fix build with recent glibc

[PATCH] uml: Fix build with recent glibc

[Andi Kleen]

From: Andi Kleen <ak@linux.intel.com>

Newer glibc did some include namespace "cleanups" and removed
struct ucontext and friends. This already broke a lot of software,
and UML seems to be the latest victim.

Use the typedefs which are still available. They also work on
older glibcs.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 arch/um/os-Linux/signal.c | 2 +-
 arch/x86/um/stub_segv.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index a86d7cc2c2d8..a5c0c909c48b 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -159,7 +159,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..fd6825537b97 100644
--- a/arch/x86/um/stub_segv.c
+++ b/arch/x86/um/stub_segv.c
@@ -10,7 +10,7 @@
 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.14.3

Re: [uml-devel] [PATCH] uml: Fix build with recent glibc

[Jesse Brandeburg]

On Wed, 28 Feb 2018 19:08:44 -0800
Andi Kleen <andi@firstfloor.org> wrote:

> From: Andi Kleen <ak@linux.intel.com>
> 
> Newer glibc did some include namespace "cleanups" and removed
> struct ucontext and friends. This already broke a lot of software,
> and UML seems to be the latest victim.
> 
> Use the typedefs which are still available. They also work on
> older glibcs.
> 
> Signed-off-by: Andi Kleen <ak@linux.intel.com>

same patch that I sent on Feb 1st.  Hope you can get more traction than
I did.

https://www.mail-archive.com/user-mode-linux-devel@lists.sourceforge.net/msg10071.html

Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>

Re: [uml-devel] [PATCH] uml: Fix build with recent glibc

[Richard Weinberger]

Am Freitag, 2. M�rz 2018, 03:30:23 CET schrieb Jesse Brandeburg:
> On Wed, 28 Feb 2018 19:08:44 -0800
> 
> Andi Kleen <andi@firstfloor.org> wrote:
> > From: Andi Kleen <ak@linux.intel.com>
> > 
> > Newer glibc did some include namespace "cleanups" and removed
> > struct ucontext and friends. This already broke a lot of software,
> > and UML seems to be the latest victim.
> > 
> > Use the typedefs which are still available. They also work on
> > older glibcs.
> > 
> > Signed-off-by: Andi Kleen <ak@linux.intel.com>
> 
> same patch that I sent on Feb 1st.  Hope you can get more traction than
> I did.
> 
> https://www.mail-archive.com/user-mode-linux-devel@lists.sourceforge.net/msg
> 10071.html
> 
> Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>

Sorry guys, due to various reasons in the last months I had not much time for 
UML. But things get better now.
The fix from the first sender is in -next and will hit Linus' tree soon.

Thanks,
//richard