riscv: fix build break after macro-to-function conversion in generic cacheflush.h
authorPaul Walmsley <paul.walmsley@sifive.com>
Wed, 17 Jul 2019 20:41:51 +0000 (13:41 -0700)
committerPaul Walmsley <paul.walmsley@sifive.com>
Thu, 18 Jul 2019 15:16:56 +0000 (08:16 -0700)
commit2d69fbf3d01a5b71e98137e2406d4087960c512e
treed079dd5bfc24309c8c1a378bc515cde247204c66
parent0f327f2aaad6a87356cbccfa390d4d3b64d0d3b6
riscv: fix build break after macro-to-function conversion in generic cacheflush.h

Commit c296d4dc13ae ("asm-generic: fix a compilation warning")
converted the various flush_*cache_* macros in
asm-generic/cacheflush.h to static inline functions.  This breaks
RISC-V builds, since RISC-V's cacheflush.h includes the generic
cacheflush.h and then undefines the macros to be overridden.

Fix by copying the subset of the no-op functions that are reused from
the generic cacheflush.h into the RISC-V cacheflush.h, and dropping
the include of the generic cacheflush.h.

Fixes: c296d4dc13ae ("asm-generic: fix a compilation warning")
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
arch/riscv/include/asm/cacheflush.h