Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02aff3aa authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/bitops: fix inline assembly constraints 



Fix inline assembly contraints for non atomic bitops functions.

This is broken since 2.6.34 987bcdac "[S390] use inline assembly
contraints available with gcc 3.3.3".

Reported-by: default avatarAndreas Krebbel <krebbel@linux.vnet.ibm.com>
Reported-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 558b9ef0

arch/s390/include/asm/bitops.h

+6 −6
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static inline void __set_bit(unsigned long nr, volatile unsigned long *ptr) 
	addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);

	asm volatile(

		"	oc	%O0(1,%R0),%1"

		: "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );

		: "+Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc");

}



static inline void
@@ -244,7 +244,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *ptr) 
	addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);

	asm volatile(

		"	nc	%O0(1,%R0),%1"

		: "=Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7]) : "cc" );

		: "+Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7]) : "cc");

}



static inline void
@@ -271,7 +271,7 @@ static inline void __change_bit(unsigned long nr, volatile unsigned long *ptr) 
	addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);

	asm volatile(

		"	xc	%O0(1,%R0),%1"

		: "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );

		: "+Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc");

}



static inline void
@@ -301,7 +301,7 @@ test_and_set_bit_simple(unsigned long nr, volatile unsigned long *ptr) 
	ch = *(unsigned char *) addr;

	asm volatile(

		"	oc	%O0(1,%R0),%1"

		: "=Q" (*(char *) addr)	: "Q" (_oi_bitmap[nr & 7])

		: "+Q" (*(char *) addr)	: "Q" (_oi_bitmap[nr & 7])

		: "cc", "memory");

	return (ch >> (nr & 7)) & 1;

}
@@ -320,7 +320,7 @@ test_and_clear_bit_simple(unsigned long nr, volatile unsigned long *ptr) 
	ch = *(unsigned char *) addr;

	asm volatile(

		"	nc	%O0(1,%R0),%1"

		: "=Q" (*(char *) addr)	: "Q" (_ni_bitmap[nr & 7])

		: "+Q" (*(char *) addr)	: "Q" (_ni_bitmap[nr & 7])

		: "cc", "memory");

	return (ch >> (nr & 7)) & 1;

}
@@ -339,7 +339,7 @@ test_and_change_bit_simple(unsigned long nr, volatile unsigned long *ptr) 
	ch = *(unsigned char *) addr;

	asm volatile(

		"	xc	%O0(1,%R0),%1"

		: "=Q" (*(char *) addr)	: "Q" (_oi_bitmap[nr & 7])

		: "+Q" (*(char *) addr)	: "Q" (_oi_bitmap[nr & 7])

		: "cc", "memory");

	return (ch >> (nr & 7)) & 1;

}