[PATCH] Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

[PATCH] Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

[Mathieu Desnoyers]

Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

A missing structure forward declaration causes a lot of warnings when
compiling for a powerpc 405. Because this header is used for assembly
too, the declaration must be put within #ifndef __ASSEMBLY__, as should
be the function prototypes.

This patch applies on 2.6.20.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

--- a/include/asm-powerpc/dcr.h
+++ b/include/asm-powerpc/dcr.h
@@ -33,10 +33,13 @@
  * base from the device-tree
  */
 #ifdef CONFIG_PPC_MERGE
+#ifndef __ASSEMBLY__
+struct device_node;
 extern unsigned int dcr_resource_start(struct device_node *np,
 				       unsigned int index);
 extern unsigned int dcr_resource_len(struct device_node *np,
 				     unsigned int index);
+#endif
 #endif /* CONFIG_PPC_MERGE */
=20
 #endif /* CONFIG_PPC_DCR */
--=20
Mathieu Desnoyers
Computer Engineering Graduate Student, =C9cole Polytechnique de Montr=E9al
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [PATCH] Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

[Benjamin Herrenschmidt]

On Mon, 2007-02-05 at 14:33 -0500, Mathieu Desnoyers wrote:
> Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h
> 
> A missing structure forward declaration causes a lot of warnings when
> compiling for a powerpc 405. Because this header is used for assembly
> too, the declaration must be put within #ifndef __ASSEMBLY__, as should
> be the function prototypes.
> 
> This patch applies on 2.6.20.
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

Out of curiosity, are you working on 405 support for arch/powerpc ?

Ben.

> --- a/include/asm-powerpc/dcr.h
> +++ b/include/asm-powerpc/dcr.h
> @@ -33,10 +33,13 @@
>   * base from the device-tree
>   */
>  #ifdef CONFIG_PPC_MERGE
> +#ifndef __ASSEMBLY__
> +struct device_node;
>  extern unsigned int dcr_resource_start(struct device_node *np,
>  				       unsigned int index);
>  extern unsigned int dcr_resource_len(struct device_node *np,
>  				     unsigned int index);
> +#endif
>  #endif /* CONFIG_PPC_MERGE */
>  
>  #endif /* CONFIG_PPC_DCR */

Re: [PATCH] Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

[Mathieu Desnoyers]

* Benjamin Herrenschmidt (benh@kernel.crashing.org) wrote:
> On Mon, 2007-02-05 at 14:33 -0500, Mathieu Desnoyers wrote:
> > Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h
> >=20
> > A missing structure forward declaration causes a lot of warnings when
> > compiling for a powerpc 405. Because this header is used for assembly
> > too, the declaration must be put within #ifndef __ASSEMBLY__, as should
> > be the function prototypes.
> >=20
> > This patch applies on 2.6.20.
> >=20
> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
>=20
> Out of curiosity, are you working on 405 support for arch/powerpc ?
>=20
> Ben.
>=20

I am just trying to compile for my LTTng tracer regression tests. I guess
I'm better off using arch/pcc instead.

> > --- a/include/asm-powerpc/dcr.h
> > +++ b/include/asm-powerpc/dcr.h
> > @@ -33,10 +33,13 @@
> >   * base from the device-tree
> >   */
> >  #ifdef CONFIG_PPC_MERGE
> > +#ifndef __ASSEMBLY__
> > +struct device_node;
> >  extern unsigned int dcr_resource_start(struct device_node *np,
> >  				       unsigned int index);
> >  extern unsigned int dcr_resource_len(struct device_node *np,
> >  				     unsigned int index);
> > +#endif
> >  #endif /* CONFIG_PPC_MERGE */
> > =20
> >  #endif /* CONFIG_PPC_DCR */
>=20

--=20
Mathieu Desnoyers
Computer Engineering Graduate Student, =C9cole Polytechnique de Montr=E9al
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [PATCH] Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

[David Gibson]

On Mon, Feb 05, 2007 at 02:33:10PM -0500, Mathieu Desnoyers wrote:
> Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h
> 
> A missing structure forward declaration causes a lot of warnings when
> compiling for a powerpc 405. Because this header is used for assembly
> too, the declaration must be put within #ifndef __ASSEMBLY__, as should
> be the function prototypes.
> 
> This patch applies on 2.6.20.

This is the wrong fix.  The arch/powerpc version of dcr.h, unlike the
arch/ppc version, should never be included in assembler.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson