* [PATCH] mips asm/types.h: add #ifndef to fix compile error
@ 2014-01-01 6:00 u74147
2014-01-06 8:22 ` Sascha Hauer
0 siblings, 1 reply; 4+ messages in thread
From: u74147 @ 2014-01-01 6:00 UTC (permalink / raw)
To: barebox
From: Du Huanpeng <u74147@gmail.com>
without "#ifndef __ASSEMBLY__ #endif", an assembly file
including this file will break compilation.
Signed-off-by: Du Huanpeng <u74147@gmail.com>
---
arch/mips/include/asm/types.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index f5373cc..b63687d 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -13,6 +13,8 @@
#include <asm-generic/int-ll64.h>
+#ifndef __ASSEMBLY__
+
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
|| defined(CONFIG_64BIT)
typedef u64 dma_addr_t;
@@ -21,6 +23,8 @@ typedef u32 dma_addr_t;
#endif
typedef u64 dma64_addr_t;
+#endif /* __ASSEMBLY__ */
+
/*
* We don't use int-l64.h for the kernel anymore but still use it for
* userspace to avoid code changes.
--
1.7.9.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mips asm/types.h: add #ifndef to fix compile error
2014-01-01 6:00 [PATCH] mips asm/types.h: add #ifndef to fix compile error u74147
@ 2014-01-06 8:22 ` Sascha Hauer
0 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2014-01-06 8:22 UTC (permalink / raw)
To: u74147; +Cc: barebox
On Wed, Jan 01, 2014 at 02:00:40PM +0800, u74147@gmail.com wrote:
> From: Du Huanpeng <u74147@gmail.com>
>
> without "#ifndef __ASSEMBLY__ #endif", an assembly file
> including this file will break compilation.
>
> Signed-off-by: Du Huanpeng <u74147@gmail.com>
Applied, thanks
Sascha
> ---
> arch/mips/include/asm/types.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
> index f5373cc..b63687d 100644
> --- a/arch/mips/include/asm/types.h
> +++ b/arch/mips/include/asm/types.h
> @@ -13,6 +13,8 @@
>
> #include <asm-generic/int-ll64.h>
>
> +#ifndef __ASSEMBLY__
> +
> #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
> || defined(CONFIG_64BIT)
> typedef u64 dma_addr_t;
> @@ -21,6 +23,8 @@ typedef u32 dma_addr_t;
> #endif
> typedef u64 dma64_addr_t;
>
> +#endif /* __ASSEMBLY__ */
> +
> /*
> * We don't use int-l64.h for the kernel anymore but still use it for
> * userspace to avoid code changes.
> --
> 1.7.9.5
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mips asm/types.h: add #ifndef to fix compile error
2013-12-30 8:29 u74147
@ 2013-12-30 15:28 ` Antony Pavlov
0 siblings, 0 replies; 4+ messages in thread
From: Antony Pavlov @ 2013-12-30 15:28 UTC (permalink / raw)
To: u74147; +Cc: barebox
On Mon, 30 Dec 2013 16:29:53 +0800
u74147@gmail.com wrote:
> From: Du Huanpeng <u74147@gmail.com>
>
> without "#ifndef __ASSEMBLY__ #endif", an assembly file
> including this file will break compilation.
>
> Signed-off-by: Du Huanpeng <u74147@gmail.com>
> ---
> arch/mips/include/asm/types.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
> index f5373cc..0341e8b 100644
> --- a/arch/mips/include/asm/types.h
> +++ b/arch/mips/include/asm/types.h
> @@ -13,6 +13,8 @@
>
> #include <asm-generic/int-ll64.h>
>
> +#ifndef __ASSEMBLY__
> +
> #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
> || defined(CONFIG_64BIT)
> typedef u64 dma_addr_t;
> @@ -21,6 +23,8 @@ typedef u32 dma_addr_t;
> #endif
> typedef u64 dma64_addr_t;
>
> +#endif
Please change this '#endif' to '#endif /* __ASSEMBLY__ */'
> +
> /*
> * We don't use int-l64.h for the kernel anymore but still use it for
> * userspace to avoid code changes.
> --
> 1.7.9.5
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
--
Best regards,
Antony Pavlov
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] mips asm/types.h: add #ifndef to fix compile error
@ 2013-12-30 8:29 u74147
2013-12-30 15:28 ` Antony Pavlov
0 siblings, 1 reply; 4+ messages in thread
From: u74147 @ 2013-12-30 8:29 UTC (permalink / raw)
To: barebox
From: Du Huanpeng <u74147@gmail.com>
without "#ifndef __ASSEMBLY__ #endif", an assembly file
including this file will break compilation.
Signed-off-by: Du Huanpeng <u74147@gmail.com>
---
arch/mips/include/asm/types.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index f5373cc..0341e8b 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -13,6 +13,8 @@
#include <asm-generic/int-ll64.h>
+#ifndef __ASSEMBLY__
+
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
|| defined(CONFIG_64BIT)
typedef u64 dma_addr_t;
@@ -21,6 +23,8 @@ typedef u32 dma_addr_t;
#endif
typedef u64 dma64_addr_t;
+#endif
+
/*
* We don't use int-l64.h for the kernel anymore but still use it for
* userspace to avoid code changes.
--
1.7.9.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-06 8:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-01 6:00 [PATCH] mips asm/types.h: add #ifndef to fix compile error u74147
2014-01-06 8:22 ` Sascha Hauer
-- strict thread matches above, loose matches on Subject: below --
2013-12-30 8:29 u74147
2013-12-30 15:28 ` Antony Pavlov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox