mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: u74147@gmail.com
To: barebox@lists.infradead.org
Subject: [PATCH] mips asm/types.h: add #ifndef to fix compile error
Date: Wed,  1 Jan 2014 14:00:40 +0800	[thread overview]
Message-ID: <1388556040-4208-1-git-send-email-u74147@gmail.com> (raw)

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

             reply	other threads:[~2014-01-01  6:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-01  6:00 u74147 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1388556040-4208-1-git-send-email-u74147@gmail.com \
    --to=u74147@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox