MIPS: futex: Restore \n after sync instructions
authorPaul Burton <paul.burton@mips.com>
Mon, 7 Oct 2019 19:58:44 +0000 (12:58 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:45:49 +0000 (16:45 +0100)
commitdc9d0a75ce9af74612d6a4d052e4df2bddfe8ed4
treeec92f5c2b071184cedad98ad5c2cae7eeaefca7d
parenta18a0a5a50e59ec12d1fddabbd699e25b0e43d59
MIPS: futex: Restore \n after sync instructions

[ Upstream commit fd7710cb491f900eb63d2ce5aac0e682003e84e9 ]

Commit 3c1d3f097972 ("MIPS: futex: Emit Loongson3 sync workarounds
within asm") inadvertently removed the newlines following
__WEAK_LLSC_MB, which causes build failures for configurations in which
__WEAK_LLSC_MB expands to a sync instruction:

  {standard input}: Assembler messages:
  {standard input}:9346: Error: symbol `sync3' is already defined
  {standard input}:9380: Error: symbol `sync3' is already defined
  ...

Fix this by restoring the newlines to separate the sync instruction from
anything following it (such as the 3: label), preventing inadvertent
concatenation.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Fixes: 3c1d3f097972 ("MIPS: futex: Emit Loongson3 sync workarounds within asm")
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/mips/include/asm/futex.h