Commit b4fd5a0a authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/atomic,bitops: mark function(s) __always_inline 



Always inline asm inlines with variable operands for "i" constraints,
since they won't compile if the compiler would decide to not inline
them.

Reported-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 51ce0221

arch/s390/include/asm/atomic_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ __ATOMIC_OPS(__atomic64_xor, long, "laxg") 
#undef __ATOMIC_OP



#define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier)	\

static inline void op_name(op_type val, op_type *ptr)			\

static __always_inline void op_name(op_type val, op_type *ptr)		\

{									\

	asm volatile(							\

		op_string "	%[ptr],%[val]\n"			\

arch/s390/include/asm/bitops.h

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ __bitops_byte(unsigned long nr, volatile unsigned long *ptr) 
	return ((unsigned char *)ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);

}



static inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)

static __always_inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)

{

	unsigned long *addr = __bitops_word(nr, ptr);

	unsigned long mask;
@@ -77,7 +77,7 @@ static inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr) 
	__atomic64_or(mask, (long *)addr);

}



static inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)

static __always_inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)

{

	unsigned long *addr = __bitops_word(nr, ptr);

	unsigned long mask;
@@ -98,7 +98,7 @@ static inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr) 
	__atomic64_and(mask, (long *)addr);

}



static inline void arch_change_bit(unsigned long nr,

static __always_inline void arch_change_bit(unsigned long nr,

					    volatile unsigned long *ptr)

{

	unsigned long *addr = __bitops_word(nr, ptr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE