]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: futex: Restore \n after sync instructions
authorPaul Burton <paul.burton@mips.com>
Mon, 7 Oct 2019 19:58:44 +0000 (12:58 -0700)
committerPaul Burton <paul.burton@mips.com>
Mon, 7 Oct 2019 19:58:44 +0000 (12:58 -0700)
commit43c52c0a1b690057b6f90254cea3af12bcbe888b
tree07a6845eaa3d2b363d30db13704cca63aec5d3a2
parent118e805a10ffac7321a5c9c3c341dc5745801d37
MIPS: futex: Restore \n after sync instructions

Commit e11ebd9bd09e ("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: e11ebd9bd09e ("MIPS: futex: Emit Loongson3 sync workarounds within asm")
arch/mips/include/asm/futex.h