From: Masahiro Yamada Date: Mon, 13 Jul 2015 04:17:05 +0000 (+0900) Subject: linux_compat: remove cpu_relax() define X-Git-Tag: v2015.10-rc1~81 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3721eaf28e5e074bebf8191e37dacbd75ffc459d;p=u-boot 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 from some sources. Drop the latter. Signed-off-by: Masahiro Yamada Reviewed-by: Heiko Schocher Acked-by: Simon Glass Reviewed-by: Lukasz Majewski --- diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c index 5a715013a2..415a9f21a9 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 #include "linux-compat.h" +#include #endif #include "musb_core.h" diff --git a/include/linux/compat.h b/include/linux/compat.h index 6ff3915216..da1420f425 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)