mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Antony Pavlov <antonynpavlov@gmail.com>
To: u74147@gmail.com
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] mips asm/types.h: add #ifndef to fix compile error
Date: Mon, 30 Dec 2013 19:28:48 +0400	[thread overview]
Message-ID: <20131230192848.b4ce60d108759a68566807c8@gmail.com> (raw)
In-Reply-To: <1388392193-5411-1-git-send-email-u74147@gmail.com>

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

  reply	other threads:[~2013-12-30 15:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-30  8:29 u74147
2013-12-30 15:28 ` Antony Pavlov [this message]
2014-01-01  6:00 u74147
2014-01-06  8:22 ` Sascha Hauer

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=20131230192848.b4ce60d108759a68566807c8@gmail.com \
    --to=antonynpavlov@gmail.com \
    --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