public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [RFC PATCH 02/12] linux_compat: remove cpu_relax() define
Date: Wed, 08 Jul 2015 07:01:16 +0200	[thread overview]
Message-ID: <559CAE9C.1090904@denx.de> (raw)
In-Reply-To: <1436329782-9179-3-git-send-email-yamada.masahiro@socionext.com>

Hello Masahiro,

Am 08.07.2015 um 06:29 schrieb Masahiro Yamada:
> The macro cpu_relax() is defined by several headers in different
> ways.
>
> arch/{arm,avr32,mips}/include/asm/processor.h defines it as follows:
>    #define cpu_relax()	barrier()
>
> On the other hand, include/linux/compat.h defines it as follows:
>    #define cpu_relax() do {} while (0)
>
> If both headers are included from the same source file, the warning
>    warning: "cpu_relax" redefined [enabled by default]
> is displayed.
>
> It effectively makes it impossible to include <linux/compat.h>
> from some sources.  Drop the latter.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>   drivers/usb/musb-new/musb_gadget_ep0.c | 1 +
>   include/linux/compat.h                 | 2 --
>   2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
> index 5a71501..415a9f2 100644
> --- a/drivers/usb/musb-new/musb_gadget_ep0.c
> +++ b/drivers/usb/musb-new/musb_gadget_ep0.c
> @@ -43,6 +43,7 @@
>   #else
>   #include <common.h>
>   #include "linux-compat.h"
> +#include <asm/processor.h>
>   #endif
>
>   #include "musb_core.h"
> diff --git a/include/linux/compat.h b/include/linux/compat.h
> index 6ff3915..da1420f 100644
> --- a/include/linux/compat.h
> +++ b/include/linux/compat.h
> @@ -315,8 +315,6 @@ struct notifier_block {};
>
>   typedef unsigned long dmaaddr_t;
>
> -#define cpu_relax() do {} while (0)
> -

doesn;t this lead to compie errors on archs, which does not define
this?

If so, we should add this in arch/{xxx}/include/asm/processor.h

beside of that.
Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>   #define pm_runtime_get_sync(dev) do {} while (0)
>   #define pm_runtime_put(dev) do {} while (0)
>   #define pm_runtime_put_sync(dev) do {} while (0)
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

  reply	other threads:[~2015-07-08  5:01 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-08  4:29 [U-Boot] [RFC PATCH 00/12] Devres (Managed Device Resource) for U-Boot Masahiro Yamada
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 01/12] x86: delete unneeded declarations of disable_irq() and enable_irq() Masahiro Yamada
2015-07-08  4:46   ` Bin Meng
2015-07-09  0:22     ` Simon Glass
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 02/12] linux_compat: remove cpu_relax() define Masahiro Yamada
2015-07-08  5:01   ` Heiko Schocher [this message]
2015-07-08  5:19     ` Masahiro Yamada
2015-07-09  0:22   ` Simon Glass
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 03/12] linux_compat: move vzalloc() to header file as an inline function Masahiro Yamada
2015-07-08  5:01   ` Heiko Schocher
2015-07-09  0:22   ` Simon Glass
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 04/12] linux_compat: handle __GFP_ZERO in kmalloc() Masahiro Yamada
2015-07-08  5:03   ` Heiko Schocher
2015-07-09  0:22   ` Simon Glass
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 05/12] dm: add DM_FLAG_BOUND flag Masahiro Yamada
2015-07-09  0:22   ` Simon Glass
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 06/12] devres: introduce Devres (Managed Device Resource) framework Masahiro Yamada
2015-07-08  5:07   ` Heiko Schocher
2015-07-09  0:22   ` Simon Glass
2015-07-09  5:16     ` Masahiro Yamada
2015-07-09  5:41       ` Albert ARIBAUD
2015-07-09 13:31         ` Simon Glass
2015-07-09 15:03           ` Albert ARIBAUD
2015-07-09 15:12             ` Simon Glass
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 07/12] devres: add devm_kmalloc() and friends (managed memory allocation) Masahiro Yamada
2015-07-09  0:23   ` Simon Glass
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 08/12] dm: refactor device_bind() and device_unbind() with devm_kzalloc() Masahiro Yamada
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 09/12] dm: merge fail_alloc labels Masahiro Yamada
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 10/12] linux_compat: introduce GFP_DMA flag for kmalloc() Masahiro Yamada
2015-07-08  5:10   ` Heiko Schocher
2015-07-08  5:15     ` Masahiro Yamada
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 11/12] dm: refactor device_probe() and device_remove() with devm_kzalloc() Masahiro Yamada
2015-07-08  5:14   ` Heiko Schocher
2015-07-08  4:29 ` [U-Boot] [RFC PATCH 12/12] devres: add debug command to dump devres Masahiro Yamada
2015-07-08  7:37   ` Masahiro Yamada

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=559CAE9C.1090904@denx.de \
    --to=hs@denx.de \
    --cc=u-boot@lists.denx.de \
    /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