From: Sascha Hauer <s.hauer@pengutronix.de>
To: u74147@gmail.com
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] mips asm/types.h: add #ifndef to fix compile error
Date: Mon, 6 Jan 2014 09:22:46 +0100 [thread overview]
Message-ID: <20140106082246.GB3677@pengutronix.de> (raw)
In-Reply-To: <1388556040-4208-1-git-send-email-u74147@gmail.com>
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
next prev parent reply other threads:[~2014-01-06 8:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-01 6:00 u74147
2014-01-06 8:22 ` Sascha Hauer [this message]
-- 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=20140106082246.GB3677@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=u74147@gmail.com \
/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