datapath: Shrink sw_flow_mask by 8 bytes (64-bit) or 4 bytes (32-bit).

[sliver-openvswitch.git] / lib / bitmap.h

diff --git a/lib/bitmap.h b/lib/bitmap.h
index f6feff0..645f15f 100644 (file)
--- a/lib/bitmap.h
+++ b/lib/bitmap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 static inline unsigned long *
 bitmap_unit__(const unsigned long *bitmap, size_t offset)
 {
-    return (unsigned long *) &bitmap[offset / BITMAP_ULONG_BITS];
+    return CONST_CAST(unsigned long *, &bitmap[offset / BITMAP_ULONG_BITS]);
 }
 
 static inline unsigned long
@@ -35,10 +35,12 @@ bitmap_bit__(size_t offset)
     return 1UL << (offset % BITMAP_ULONG_BITS);
 }
 
+#define BITMAP_N_LONGS(N_BITS) DIV_ROUND_UP(N_BITS, BITMAP_ULONG_BITS)
+
 static inline size_t
 bitmap_n_longs(size_t n_bits)
 {
-    return DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS);
+    return BITMAP_N_LONGS(n_bits);
 }
 
 static inline size_t
@@ -53,6 +55,8 @@ bitmap_allocate(size_t n_bits)
     return xzalloc(bitmap_n_bytes(n_bits));
 }
 
+unsigned long *bitmap_allocate1(size_t n_bits);
+
 static inline unsigned long *
 bitmap_clone(const unsigned long *bitmap, size_t n_bits)
 {