diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-13 13:17:05 +0900 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-07-22 07:30:37 -0600 |
| commit | 3721eaf28e5e074bebf8191e37dacbd75ffc459d (patch) | |
| tree | 4cc6db6b2615ed22b5c6539af7d301de7f58a471 | |
| parent | 5f7e310467b62e136831f6ea418c91f82df18b77 (diff) | |
| download | u-boot-imx-3721eaf28e5e074bebf8191e37dacbd75ffc459d.zip u-boot-imx-3721eaf28e5e074bebf8191e37dacbd75ffc459d.tar.gz u-boot-imx-3721eaf28e5e074bebf8191e37dacbd75ffc459d.tar.bz2 | |
linux_compat: remove cpu_relax() define
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>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
| -rw-r--r-- | drivers/usb/musb-new/musb_gadget_ep0.c | 1 | ||||
| -rw-r--r-- | include/linux/compat.h | 2 |
2 files changed, 1 insertions, 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) |