[PATCH 5.0 003/122] ARC: memset: fix build with L1_CACHE_SHIFT != 6

Greg Kroah-Hartman
2019-05-06T14:34:16Z

From: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>

commit 55c0c4c793b538fb438bcc72481b9dc2f79fe5a9 upstream.

In case of 'L1_CACHE_SHIFT != 6' we define dummy assembly macroses
PREALLOC_INSTR and PREFETCHW_INSTR without arguments. However
we pass arguments to them in code which cause build errors.
Fix that.

Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Cc: <stable@vger.kernel.org> [5.0]
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
arch/arc/lib/memset-archs.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/arc/lib/memset-archs.S
+++ b/arch/arc/lib/memset-archs.S
@@ -30,10 +30,10 @@

#else

-.macro PREALLOC_INSTR
+.macro PREALLOC_INSTR reg, off
.endm

-.macro PREFETCHW_INSTR
+.macro PREFETCHW_INSTR reg, off
.endm

#endif