From: Jens Axboe Date: Thu, 22 Nov 2012 12:52:56 +0000 (+0100) Subject: bitmap: fix bit_masks[] for 32-bit compiles X-Git-Tag: fio-2.0.12~38^2~10 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=c49715cf1851eba876cc0ee393e3f96e63209764;ds=inline bitmap: fix bit_masks[] for 32-bit compiles Signed-off-by: Jens Axboe --- diff --git a/lib/bitmap.c b/lib/bitmap.c index a88b680c..8dd09985 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -193,7 +193,9 @@ static unsigned long bit_masks[] = { 0x00000000000fffff, 0x00000000001fffff, 0x00000000003fffff, 0x00000000007fffff, 0x0000000000ffffff, 0x0000000001ffffff, 0x0000000003ffffff, 0x0000000007ffffff, 0x000000000fffffff, 0x000000001fffffff, 0x000000003fffffff, 0x000000007fffffff, - 0x00000000ffffffff, 0x00000001ffffffff, 0x00000003ffffffff, 0x00000007ffffffff, + 0x00000000ffffffff, +#if BITS_PER_LONG == 64 + 0x00000001ffffffff, 0x00000003ffffffff, 0x00000007ffffffff, 0x0000000fffffffff, 0x0000001fffffffff, 0x0000003fffffffff, 0x0000007fffffffff, 0x000000ffffffffff, 0x000001ffffffffff, 0x000003ffffffffff, 0x000007ffffffffff, 0x00000fffffffffff, 0x00001fffffffffff, 0x00003fffffffffff, 0x00007fffffffffff, @@ -201,7 +203,9 @@ static unsigned long bit_masks[] = { 0x000fffffffffffff, 0x001fffffffffffff, 0x003fffffffffffff, 0x007fffffffffffff, 0x00ffffffffffffff, 0x01ffffffffffffff, 0x03ffffffffffffff, 0x07ffffffffffffff, 0x0fffffffffffffff, 0x1fffffffffffffff, 0x3fffffffffffffff, 0x7fffffffffffffff, - 0xffffffffffffffff }; + 0xffffffffffffffff +#endif +}; static int bitmap_set_fn(struct bitmap_level *bl, unsigned long offset, unsigned int bit, void *__data)