[PATCH] lib/radix-tree: Fix "nocast type" warnings

[linux-2.6] / lib / bitmap.c

diff --git a/lib/bitmap.c b/lib/bitmap.c
index d1388a5ce89c37c6934a5ac8384443a902365b5e..fb9371fdd44a43c4e8e4fc9304f0ee00d3b4df8c 100644 (file)
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -289,7 +289,6 @@ EXPORT_SYMBOL(__bitmap_weight);
 
 #define CHUNKSZ                                32
 #define nbits_to_hold_value(val)       fls(val)
-#define roundup_power2(val,modulus)    (((val) + (modulus) - 1) & ~((modulus) - 1))
 #define unhex(c)                       (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10))
 #define BASEDEC 10             /* fancier cpuset lists input in decimal */
 
@@ -316,7 +315,7 @@ int bitmap_scnprintf(char *buf, unsigned int buflen,
        if (chunksz == 0)
                chunksz = CHUNKSZ;
 
-       i = roundup_power2(nmaskbits, CHUNKSZ) - CHUNKSZ;
+       i = ALIGN(nmaskbits, CHUNKSZ) - CHUNKSZ;
        for (; i >= 0; i -= CHUNKSZ) {
                chunkmask = ((1ULL << chunksz) - 1);
                word = i / BITS_PER_LONG;