Re: [Xen-devel] [PATCH v5 2/3] xen/arm: Add p2m_ipa_bits

["Edgar E. Iglesias" <edgar.iglesias@xxxxxxxxx>]

On Wed, May 06, 2015 at 02:00:36PM +0100, Julien Grall wrote:
> Hi Edgar,
> 
> On 06/05/15 06:28, Edgar E. Iglesias wrote:
> > diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> > index 59dd23a..98f1019 100644
> > --- a/xen/arch/arm/p2m.c
> > +++ b/xen/arch/arm/p2m.c
> > @@ -17,9 +17,11 @@
> 
> [..]
> 
> > +const unsigned int __read_mostly p2m_ipa_bits = 40;
> 
> [..]
> 
> > diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
> > index 341df55..63748ef 100644
> > --- a/xen/include/asm-arm/p2m.h
> > +++ b/xen/include/asm-arm/p2m.h
> > @@ -10,6 +10,9 @@
> >  
> >  #define paddr_bits PADDR_BITS
> >  
> > +/* Holds the bit size of IPAs in p2m tables.  */
> > +extern unsigned int p2m_ipa_bits;
> > +
> 
> The two declarations of p2m_ipa_bits are different on ARM32. GCC will
> fail to build with:
> 
> p2m.c:24:34: error: conflicting type qualifiers for âp2m_ipa_bitsâ
>  const unsigned int __read_mostly p2m_ipa_bits = 40;
>                                   ^
> In file included from works/xen/xen/include/asm/domain.h:8:0,
>                  from works/xen/xen/include/xen/domain.h:6,
>                  from works/xen/xen/include/xen/sched.h:10,
>                  from p2m.c:2:
> works/xen/xen/include/asm/p2m.h:14:21: note: previous declaration of
> âp2m_ipa_bitsâ was here
>  extern unsigned int p2m_ipa_bits;
>                      ^
> I would either drop the const in p2m.c or use a define for ARM32 in
> asm-arm/p2m.h


Thanks for catching that Julien,

I've setup an environment to build arm32 aswell now.

I went back and removed the const and back to a single declaration of
p2m_ipa_bits __read_mostly.

Sending v6 in a second.

Cheers,
Edgar

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel