diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-07-25 10:18:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-11 18:35:25 -0700 |
| commit | fa2446744dd5a99a3938aad9faade9b8928aec48 (patch) | |
| tree | ed56acf132f5d54553e2e4383c929f341addbb5b /arch/s390 | |
| parent | 72e2729ea923cbbbeda03e5fce14f50b0707f724 (diff) | |
| download | linux-3.10-fa2446744dd5a99a3938aad9faade9b8928aec48.tar.gz linux-3.10-fa2446744dd5a99a3938aad9faade9b8928aec48.tar.bz2 linux-3.10-fa2446744dd5a99a3938aad9faade9b8928aec48.zip | |
s390/bitops: fix find_next_bit_left
commit 3b0040a47ad63f7147e9e7d2febb61a3b564bb90 upstream.
The find_next_bit_left function is broken if used with an offset which
is not a multiple of 64. The shift to mask the bits of a 64-bit word
not to search is in the wrong direction, the result can be either a
bit found smaller than the offset or failure to find a set bit.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h index 4d8604e311f..7d467675873 100644 --- a/arch/s390/include/asm/bitops.h +++ b/arch/s390/include/asm/bitops.h @@ -693,7 +693,7 @@ static inline int find_next_bit_left(const unsigned long *addr, size -= offset; p = addr + offset / BITS_PER_LONG; if (bit) { - set = __flo_word(0, *p & (~0UL << bit)); + set = __flo_word(0, *p & (~0UL >> bit)); if (set >= size) return size + offset; if (set < BITS_PER_LONG) |