Subject: Re: [linux-next][PATCH] revert headers_check fix: ia64, fpu.h

From: Jaswinder Singh Rajput <[email-masked]>
Date: Fri, 06 Feb 2009 20:59:01 +0530

On Fri, 2009-02-06 at 15:55 +0100, Ingo Molnar wrote:
> * KOSAKI Motohiro <[email-masked]> wrote:
> 
> > > > Index: b/arch/ia64/include/asm/fpu.h
> > > > ===================================================================
> > > > --- a/arch/ia64/include/asm/fpu.h
> > > > +++ b/arch/ia64/include/asm/fpu.h
> > > > @@ -6,7 +6,7 @@
> > > >  *     David Mosberger-Tang <[email-masked]>
> > > >  */
> > > >
> > > > -#include <linux/types.h>
> > > > +#include <asm/types.h>
> > > >
> > > 
> > > No , we do not even need asm/types.h
> > > 
> > > Subject: [PATCH] Neither asm/types.h nor linux/types.h is not required
> > > for arch/ia64/include/asm/fpu.h
> > > 
> > > Signed-off-by: Jaswinder Singh Rajput <[email-masked]>
> > 
> > ok. I confirmed.
> > 	Tested-by: KOSAKI Motohiro <[email-masked]>
> > 	Reviewed-by: KOSAKI Motohiro <[email-masked]>
> 
> Thanks.
> 
> Jaswinder, mind adding these tags to the commit and sending a pull request 
> with all fixes?

The following changes since commit 0b86a4e34d885e734a4c4e46293376f3f1c639eb:
  Ingo Molnar (1):
        Merge branch 'core/header-fixes' of git://git.kernel.org/.../jaswinder/linux-2.6-tip into core/header-fixes

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git core/header-fixes

Jaswinder Singh Rajput (2):
      Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
      make linux/types.h as assembly safe

 arch/ia64/include/asm/fpu.h |    2 --
 include/linux/types.h       |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

Complete diff:
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h
index b6395ad..0c26157 100644
--- a/arch/ia64/include/asm/fpu.h
+++ b/arch/ia64/include/asm/fpu.h
@@ -6,8 +6,6 @@
  *	David Mosberger-Tang <[email-masked]>
  */
 
-#include <linux/types.h>
-
 /* floating point status register: */
 #define FPSR_TRAP_VD	(1 << 0)	/* invalid op trap disabled */
 #define FPSR_TRAP_DD	(1 << 1)	/* denormal trap disabled */
diff --git a/include/linux/types.h b/include/linux/types.h
index 712ca53..c30973a 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
+#ifndef __ASSEMBLY__
 #ifdef	__KERNEL__
 
 #define DECLARE_BITMAP(name,bits) \
@@ -212,5 +213,5 @@ struct ustat {
 };
 
 #endif	/* __KERNEL__ */
-
+#endif /*  __ASSEMBLY__ */
 #endif /* _LINUX_TYPES_H */