[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 21/26] bitmap: refine and move BITMAP_{FIRST/LAST}_
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 21/26] bitmap: refine and move BITMAP_{FIRST/LAST}_WORD_MASK |
Date: |
Sat, 8 Oct 2016 11:58:07 +0300 |
From: Wei Yang <address@hidden>
According to linux kernel commit <89c1e79eb30> ("linux/bitmap.h: improve
BITMAP_{LAST,FIRST}_WORD_MASK"), these two macro could be improved.
This patch takes this change and also move them all in header file.
Signed-off-by: Wei Yang <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
include/qemu/bitmap.h | 7 ++-----
util/bitmap.c | 2 --
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h
index 7247f14..63ea2d0 100644
--- a/include/qemu/bitmap.h
+++ b/include/qemu/bitmap.h
@@ -57,11 +57,8 @@
* find_next_bit(addr, nbits, bit) Position next set bit in *addr >= bit
*/
-#define BITMAP_LAST_WORD_MASK(nbits) \
- ( \
- ((nbits) % BITS_PER_LONG) ? \
- (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL \
- )
+#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
+#define BITMAP_LAST_WORD_MASK(nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1)))
#define DECLARE_BITMAP(name,bits) \
unsigned long name[BITS_TO_LONGS(bits)]
diff --git a/util/bitmap.c b/util/bitmap.c
index 40aadfb..43ed011 100644
--- a/util/bitmap.c
+++ b/util/bitmap.c
@@ -157,8 +157,6 @@ int slow_bitmap_andnot(unsigned long *dst, const unsigned
long *bitmap1,
return result != 0;
}
-#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
-
void bitmap_set(unsigned long *map, long start, long nr)
{
unsigned long *p = map + BIT_WORD(start);
--
2.1.4
- [Qemu-trivial] [PULL 16/26] qapi: make the json schema files more regular., (continued)
- [Qemu-trivial] [PULL 16/26] qapi: make the json schema files more regular., Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 10/26] MAINTAINERS: Add some more rocker related files, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 13/26] MAINTAINERS: Add some more MIPS related files, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 14/26] MAINTAINERS: Some updates related to the SH4 machines, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 17/26] usb: ehci: fix memory leak in ehci_process_itd, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 11/26] MAINTAINERS: Add some more pattern to recognize all win32 related files, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 03/26] tests: Ignore test executables, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 09/26] MAINTAINERS: Add header files to CRIS section, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 19/26] m68k: change default system clock for m5208evb, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 26/26] net/filter-mirror: Fix mirror initial check typo, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 21/26] bitmap: refine and move BITMAP_{FIRST/LAST}_WORD_MASK,
Michael Tokarev <=
- [Qemu-trivial] [PULL 22/26] CODING_STYLE: Fix a typo ("have" vs. "has"), Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 05/26] MAINTAINERS: Add some more files to the HMP section, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 07/26] MAINTAINERS: Add some SPARC machine related files, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 23/26] char: fix missing return in error path for chardev TLS init, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 02/26] bt-hci-csr: drop unused argument, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 20/26] build-sys: fix find-in-path, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 04/26] MAINTAINERS: Add files to the Moxie section., Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 06/26] MAINTAINERS: Add include/hw/audio/ to audio section, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 18/26] exec: remove unused compacted argument, Michael Tokarev, 2016/10/08
- [Qemu-trivial] [PULL 15/26] maint: Add module_block.h to .gitignore, Michael Tokarev, 2016/10/08