[PATCH 3/3] powerpc/vdso: Disable building the 32-bit VDSO on little endian

Michael Ellerman mpe at ellerman.id.au
Thu Apr 23 14:37:55 AEST 2015


On Thu, 2015-04-23 at 13:06 +1000, Stephen Rothwell wrote:
> Hi Michael,
> 
> On Wed, 22 Apr 2015 15:40:36 +1000 Michael Ellerman <mpe at ellerman.id.au> wrote:
> >
> > diff --git a/arch/powerpc/include/asm/vdso.h b/arch/powerpc/include/asm/vdso.h
> > index c53f5f6d1761..f455adb471e7 100644
> > --- a/arch/powerpc/include/asm/vdso.h
> > +++ b/arch/powerpc/include/asm/vdso.h
> > @@ -19,6 +19,7 @@
> >  
> >  /* Offsets relative to thread->vdso_base */
> >  extern unsigned long vdso64_rt_sigtramp;
> > +
> >  extern unsigned long vdso32_sigtramp;
> >  extern unsigned long vdso32_rt_sigtramp;
> 
> You could drop this hunk :-)

Darn it.

> > diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
> > index 8331d0bef0fb..c2bd45187315 100644
> > --- a/arch/powerpc/kernel/vdso.c
> > +++ b/arch/powerpc/kernel/vdso.c
> > @@ -49,12 +49,15 @@
> >  /* The alignment of the vDSO */
> >  #define VDSO_ALIGNMENT	(1 << 16)
> >  
> > -extern char vdso32_start, vdso32_end;
> > -static void *vdso32_kbase = &vdso32_start;
> >  static unsigned int vdso32_pages;
> > +static void *vdso32_kbase;
> >  static struct page **vdso32_pagelist;
> > -unsigned long vdso32_sigtramp;
> > -unsigned long vdso32_rt_sigtramp;
> > +unsigned long vdso32_sigtramp = 0;
> > +unsigned long vdso32_rt_sigtramp = 0;
> 
> And they should be zero anyway, right?

Yeah I guess, I wanted to be sure :)

cheers




More information about the Linuxppc-dev mailing list