Commit f12fb73b authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

mm: delete checks for xor_unlock_is_negative_byte() 

Architectures which don't define their own use the one in
asm-generic/bitops/lock.h.  Get rid of all the ifdefs around "maybe we
don't have it".

Link: https://lkml.kernel.org/r/20231004165317.1061855-15-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 12010aa8

arch/alpha/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static inline bool xor_unlock_is_negative_byte(unsigned long mask, 


	return (old & BIT(7)) != 0;

}

#define xor_unlock_is_negative_byte xor_unlock_is_negative_byte



/*

 * ffz = Find First Zero in word. Undefined if no zero exists,

arch/m68k/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ static inline bool xor_unlock_is_negative_byte(unsigned long mask, 
	return result;

#endif

}

#define xor_unlock_is_negative_byte xor_unlock_is_negative_byte



/*

 *	The true 68020 and more advanced processors support the "bfffo"

arch/mips/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ static inline bool xor_unlock_is_negative_byte(unsigned long mask, 


	return res;

}

#define xor_unlock_is_negative_byte xor_unlock_is_negative_byte



#undef __bit_op

#undef __test_bit_op

arch/riscv/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ static inline bool xor_unlock_is_negative_byte(unsigned long mask, 
		: "memory");

	return (res & BIT(7)) != 0;

}

#define xor_unlock_is_negative_byte xor_unlock_is_negative_byte



#undef __test_and_op_bit

#undef __op_bit

include/asm-generic/bitops/instrumented-lock.h

+0 −5
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static inline bool test_and_set_bit_lock(long nr, volatile unsigned long *addr) 
	return arch_test_and_set_bit_lock(nr, addr);

}



#if defined(arch_xor_unlock_is_negative_byte)

/**

 * xor_unlock_is_negative_byte - XOR a single byte in memory and test if

 * it is negative, for unlock.
@@ -80,8 +79,4 @@ static inline bool xor_unlock_is_negative_byte(unsigned long mask, 
	instrument_atomic_write(addr, sizeof(long));

	return arch_xor_unlock_is_negative_byte(mask, addr);

}

/* Let everybody know we have it. */

#define xor_unlock_is_negative_byte xor_unlock_is_negative_byte

#endif



#endif /* _ASM_GENERIC_BITOPS_INSTRUMENTED_LOCK_H */