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

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

[S390] bitops: remove likely annotations 



likely/unlikely profiling revealed that none of the branches in bitops
is taken likely or unlikely. So remove the annotations.
In addition the generated code is shorter.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent ced2c8bc

arch/s390/include/asm/bitops.h

+6 −6
Original line number Diff line number Diff line
@@ -525,16 +525,16 @@ static inline unsigned long __ffs_word_loop(const unsigned long *addr, 
static inline unsigned long __ffz_word(unsigned long nr, unsigned long word)

{

#ifdef __s390x__

	if (likely((word & 0xffffffff) == 0xffffffff)) {

	if ((word & 0xffffffff) == 0xffffffff) {

		word >>= 32;

		nr += 32;

	}

#endif

	if (likely((word & 0xffff) == 0xffff)) {

	if ((word & 0xffff) == 0xffff) {

		word >>= 16;

		nr += 16;

	}

	if (likely((word & 0xff) == 0xff)) {

	if ((word & 0xff) == 0xff) {

		word >>= 8;

		nr += 8;

	}
@@ -549,16 +549,16 @@ static inline unsigned long __ffz_word(unsigned long nr, unsigned long word) 
static inline unsigned long __ffs_word(unsigned long nr, unsigned long word)

{

#ifdef __s390x__

	if (likely((word & 0xffffffff) == 0)) {

	if ((word & 0xffffffff) == 0) {

		word >>= 32;

		nr += 32;

	}

#endif

	if (likely((word & 0xffff) == 0)) {

	if ((word & 0xffff) == 0) {

		word >>= 16;

		nr += 16;

	}

	if (likely((word & 0xff) == 0)) {

	if ((word & 0xff) == 0) {

		word >>= 8;

		nr += 8;

	}