Re: [git pull -tip] headers_check fixes for other architectures

From: Jaswinder Singh Rajput
Date: Fri Feb 06 2009 - 14:34:28 EST


On Fri, 2009-02-06 at 19:42 +0100, Sam Ravnborg wrote:
> >
> > Subject: [PATCH] make linux/types.h as assembly safe
> >
> > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@xxxxxxxxx>
> > ---
> > include/linux/types.h | 6 +++++-
> > 1 files changed, 5 insertions(+), 1 deletions(-)
> >
> > diff --git a/include/linux/types.h b/include/linux/types.h
> > index 712ca53..e1322a7 100644
> > --- a/include/linux/types.h
> > +++ b/include/linux/types.h
> > @@ -1,6 +1,10 @@
> > #ifndef _LINUX_TYPES_H
> > #define _LINUX_TYPES_H
> >
> > +#ifdef __ASSEMBLY__
> > +# include <asm/types.h>
> > +#else /* __ASSEMBLY__ */
>
> Please use:
> #ifndef __ASEMBLY__
>
> This is what is used in the most cases.
>
> And I think you need to nuke an include in the file a bit later
> so we do not include asm/types.h twice.
>

Is this looks OK:

Subject: [PATCH] make linux/types.h as assembly safe

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@xxxxxxxxx>
---
include/linux/types.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/linux/types.h b/include/linux/types.h
index 712ca53..6f12467 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,6 +1,10 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H

+#include <asm/types.h>
+
+#ifndef __ASSEMBLY__
+
#ifdef __KERNEL__

#define DECLARE_BITMAP(name,bits) \
@@ -9,7 +13,6 @@
#endif

#include <linux/posix_types.h>
-#include <asm/types.h>

#ifndef __KERNEL_STRICT_NAMES

@@ -212,5 +215,5 @@ struct ustat {
};

#endif /* __KERNEL__ */
-
+#endif /* __ASSEMBLY__ */
#endif /* _LINUX_TYPES_H */
--
1.6.0.6



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/