Commit 0a113efc authored Apr 08, 2019 by Arnd Bergmann Committed by Martin Schwidefsky Apr 11, 2019

s390: make __load_psw_mask work with clang



clang fails to use the %O and %R inline assembly modifiers
the same way as gcc, leading to build failures with every use
of __load_psw_mask():

/tmp/nmi-4a9f80.s: Assembler messages:
/tmp/nmi-4a9f80.s:571: Error: junk at end of line: `+8(160(%r11))'
/tmp/nmi-4a9f80.s:626: Error: junk at end of line: `+8(160(%r11))'

Replace these with a more conventional way of passing the addresses
that should work with both clang and gcc.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent efb150df

arch/s390/include/asm/processor.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -339,10 +339,10 @@ static __no_kasan_or_inline void __load_psw_mask(unsigned long mask)

		asm volatile(
		" larl %0,1f\n"
		" stg %0,%O1+8(%R1)\n"
		" lpswe %1\n"
		" stg %0,%1\n"
		" lpswe %2\n"
		"1:"
		: "=&d" (addr), "=Q" (psw) : "Q" (psw) : "memory", "cc");
		: "=&d" (addr), "=Q" (psw.addr) : "Q" (psw) : "memory", "cc");
		}

		/*

Admin message