diff --git a/[refs] b/[refs] index 55fca45f5f4f..3ac965f4dc8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0defa3c19e7792001df09d6fa5ab461d3599ff6d +refs/heads/master: ef1bea9e2a5a72d2c3362522e0a09099406732ff diff --git a/trunk/include/asm-s390/bitops.h b/trunk/include/asm-s390/bitops.h index 61232760cc3b..3628899f48bb 100644 --- a/trunk/include/asm-s390/bitops.h +++ b/trunk/include/asm-s390/bitops.h @@ -518,8 +518,8 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr static inline int __constant_test_bit(unsigned long nr, const volatile unsigned long *addr) { - return ((((volatile char *) addr) - [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7)))) != 0; + return (((volatile char *) addr) + [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7))) != 0; } #define test_bit(nr,addr) \