Messages in this thread | | | Date | Thu, 5 Feb 2009 09:55:13 -0800 | Subject | Re: [git pull -tip] headers_check fixes for other architectures | From | Tony Luck <> |
| |
On Fri, Jan 30, 2009 at 11:10 PM, Jaswinder Singh Rajput <jaswinder@kernel.org> wrote: > These are clean patches, I did not included anything which leads to any > confusion or conflicts. I hope maintainers do not mind if these patches > go to mainstream via Ingo's -tip along with other headers_check fixes. > headers_check fix: ia64, fpu.h
> diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h > index 3859558..b6395ad 100644 > --- a/arch/ia64/include/asm/fpu.h > +++ b/arch/ia64/include/asm/fpu.h > @@ -6,7 +6,7 @@ > * David Mosberger-Tang <davidm@hpl.hp.com> > */ > > -#include <asm/types.h> > +#include <linux/types.h> > > /* floating point status register: */ > #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
This one breaks the ia64 build for linux-next (since some assembly files include <asm/fpu.h> which then goes on to pull in a whole bunch of "C" include files that don't have __ASSEMBLY__ guards and so the assembler chokes on "enum" and "typedef" etc.)
Either revert this part ... or wrap the #include like this in fpu.h:
#ifndef __ASSEMBLY__ #include <linux/types.h> #endif
Thanks
-Tony
| |