Module Name: src
Committed By: christos
Date: Thu Mar 8 20:32:33 UTC 2018
Modified Files:
src/sys/sys: bitops.h
Log Message:
PR/53081: Fix size of the shift to depend on the type of the bitmap so that
we get the correct width.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/sys/bitops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/bitops.h
diff -u src/sys/sys/bitops.h:1.13 src/sys/sys/bitops.h:1.14
--- src/sys/sys/bitops.h:1.13 Thu Mar 8 05:06:18 2018
+++ src/sys/sys/bitops.h Thu Mar 8 15:32:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bitops.h,v 1.13 2018/03/08 10:06:18 mrg Exp $ */
+/* $NetBSD: bitops.h,v 1.14 2018/03/08 20:32:32 christos Exp $ */
/*-
* Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -304,7 +304,7 @@ fast_remainder32(uint32_t _v, uint32_t _
#define __BITMAP_SIZE(__t, __n) \
(((__n) + (__BITMAP_BITS(__t) - 1)) / __BITMAP_BITS(__t))
#define __BITMAP_BIT(__n, __v) \
- (1ul << ((__n) & __BITMAP_MASK(*(__v)->_b)))
+ ((__typeof__((__v)->_b[0]))1 << ((__n) & __BITMAP_MASK(*(__v)->_b)))
#define __BITMAP_WORD(__n, __v) \
((__n) >> __BITMAP_SHIFT(*(__v)->_b))
