From: Lukasz Majewski <l.majewski@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 02/14] linux_compat: remove cpu_relax() define
Date: Mon, 13 Jul 2015 09:38:28 +0200 [thread overview]
Message-ID: <20150713093828.7e9ff260@amdc2363> (raw)
In-Reply-To: <1436761037-19635-3-git-send-email-yamada.masahiro@socionext.com>
Hi Masahiro,
> 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>
> Reviewed-by: Heiko Schocher <hs@denx.de>
> Acked-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
> 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)
> -
> #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)
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
next prev parent reply other threads:[~2015-07-13 7:38 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 4:17 [U-Boot] [PATCH v2 00/14] Devres (Managed Device Resource) for U-Boot Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 01/14] x86: delete unneeded declarations of disable_irq() and enable_irq() Masahiro Yamada
2015-07-22 23:24 ` Simon Glass
2015-07-13 4:17 ` [U-Boot] [PATCH v2 02/14] linux_compat: remove cpu_relax() define Masahiro Yamada
2015-07-13 7:38 ` Lukasz Majewski [this message]
2015-07-22 23:24 ` Simon Glass
2015-07-13 4:17 ` [U-Boot] [PATCH v2 03/14] linux_compat: move vzalloc() to header file as an inline function Masahiro Yamada
2015-07-22 23:24 ` Simon Glass
2015-07-13 4:17 ` [U-Boot] [PATCH v2 04/14] linux_compat: handle __GFP_ZERO in kmalloc() Masahiro Yamada
2015-07-13 7:47 ` Lukasz Majewski
2015-07-22 23:24 ` Simon Glass
2015-07-13 4:17 ` [U-Boot] [PATCH v2 05/14] dm: add DM_FLAG_BOUND flag Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 06/14] devres: introduce Devres (Managed Device Resource) framework Masahiro Yamada
2015-07-18 14:37 ` Simon Glass
2015-07-13 4:17 ` [U-Boot] [PATCH v2 07/14] devres: add devm_kmalloc() and friends (managed memory allocators) Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 08/14] dm: refactor device_bind() and device_unbind() with devm_kzalloc() Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 09/14] dm: merge fail_alloc labels Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 10/14] linux_compat: introduce GFP_DMA flag for kmalloc() Masahiro Yamada
2015-07-13 7:52 ` Lukasz Majewski
2015-07-13 8:03 ` Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 11/14] dm: refactor device_probe() and device_remove() with devm_kzalloc() Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 12/14] devres: add debug command to dump device resources Masahiro Yamada
2015-07-13 4:17 ` [U-Boot] [PATCH v2 13/14] dm: remove redundant CONFIG_DM from driver/core/Makefile Masahiro Yamada
2015-07-16 0:59 ` Simon Glass
2015-07-17 23:59 ` Simon Glass
2015-07-13 4:17 ` [U-Boot] [PATCH v2 14/14] devres: compile Devres iif CONFIG_DM_DEVICE_REMOVE is enabled Masahiro Yamada
2015-07-13 6:51 ` [U-Boot] [PATCH v2 00/14] Devres (Managed Device Resource) for U-Boot Albert ARIBAUD
2015-07-13 7:39 ` Masahiro Yamada
2015-07-13 10:55 ` Albert ARIBAUD
2015-07-13 11:42 ` Masahiro Yamada
2015-07-13 17:16 ` Albert ARIBAUD
2015-07-18 14:37 ` Simon Glass
2015-07-20 6:21 ` Masahiro Yamada
2015-07-20 14:16 ` Simon Glass
2015-07-22 17:15 ` 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=20150713093828.7e9ff260@amdc2363 \
--to=l.majewski@samsung.com \
--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