LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Masahiro Yamada 2015-07-13 13:17:05 +09:00 committed by Simon Glass
parent 5f7e310467
commit 3721eaf28e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/musb-new/musb_gadget_ep0.c
View File

@ -43,6 +43,7 @@
#else
#include <common.h>
#include "linux-compat.h"
#include <asm/processor.h>
#endif
#include "musb_core.h"

2
include/linux/compat.h
View File

@ -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)