[PATCH] mips asm/types.h: add #ifndef to fix compile error

u74147 at gmail.com u74147 at gmail.com
Wed Jan 1 01:00:40 EST 2014


From: Du Huanpeng <u74147 at gmail.com>

without "#ifndef __ASSEMBLY__ #endif", an assembly file
including this file will break compilation.

Signed-off-by: Du Huanpeng <u74147 at 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




More information about the barebox mailing list