From 1af1ed8500bf10a1bd4f00bea6daaaa3e72578f8 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 9 Nov 2013 15:21:12 -0800 Subject: [PATCH] bitmap: New macro BITMAP_N_LONGS for use in constant expressions. An upcoming commit will declare a bitmap on the stack, rather than heap allocating it, which means that it is not possible to use a function call in the declaration. Signed-off-by: Ben Pfaff --- lib/bitmap.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bitmap.h b/lib/bitmap.h index 898049623..645f15f22 100644 --- a/lib/bitmap.h +++ b/lib/bitmap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * 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. @@ -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 -- 2.43.0