[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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index 334964a0fb143a5de9cd7d51c49053bdf64765e9..b30606f6d5230e45b4eb8f4e3f009eb929d02a84 100644 (file)
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -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;
        }