Module Name: src
Committed By: riastradh
Date: Mon Aug 6 00:29:57 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: bitops.h
Log Message:
Fix find_first_zero_bit to find the high bits of 64-bit words...oops.
XXX pullup
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/include/linux/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/external/bsd/drm2/include/linux/bitops.h
diff -u src/sys/external/bsd/drm2/include/linux/bitops.h:1.12 src/sys/external/bsd/drm2/include/linux/bitops.h:1.13
--- src/sys/external/bsd/drm2/include/linux/bitops.h:1.12 Mon Aug 6 00:29:49 2018
+++ src/sys/external/bsd/drm2/include/linux/bitops.h Mon Aug 6 00:29:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bitops.h,v 1.12 2018/08/06 00:29:49 riastradh Exp $ */
+/* $NetBSD: bitops.h,v 1.13 2018/08/06 00:29:57 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -171,7 +171,8 @@ find_first_zero_bit(const unsigned long
break;
}
- result += ffs(~*p | (~0UL << MIN(nbits, bpl)));
+ CTASSERT(sizeof(unsigned long) <= sizeof(uint64_t));
+ result += ffs64(~(uint64_t)*p | (~0UL << MIN(nbits, bpl)));
return result;
}
