diff options
author | Nick Wilson <njw@osdl.org> | 2005-06-25 17:59:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:02 -0400 |
commit | 8c0e33c133021ee241e9d51255b9fb18eb34ef0e (patch) | |
tree | 30ddff7f7cf375c36d11d49352365a42b25e1def /lib | |
parent | f45494480f31342125870c1a184999d7c5a59471 (diff) |
[PATCH] Use ALIGN to remove duplicate code
This patch makes use of ALIGN() to remove duplicate round-up code.
Signed-off-by: Nick Wilson <njw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bitmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bitmap.c b/lib/bitmap.c index d1388a5ce89..fb9371fdd44 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c | |||
@@ -289,7 +289,6 @@ EXPORT_SYMBOL(__bitmap_weight); | |||
289 | 289 | ||
290 | #define CHUNKSZ 32 | 290 | #define CHUNKSZ 32 |
291 | #define nbits_to_hold_value(val) fls(val) | 291 | #define nbits_to_hold_value(val) fls(val) |
292 | #define roundup_power2(val,modulus) (((val) + (modulus) - 1) & ~((modulus) - 1)) | ||
293 | #define unhex(c) (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10)) | 292 | #define unhex(c) (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10)) |
294 | #define BASEDEC 10 /* fancier cpuset lists input in decimal */ | 293 | #define BASEDEC 10 /* fancier cpuset lists input in decimal */ |
295 | 294 | ||
@@ -316,7 +315,7 @@ int bitmap_scnprintf(char *buf, unsigned int buflen, | |||
316 | if (chunksz == 0) | 315 | if (chunksz == 0) |
317 | chunksz = CHUNKSZ; | 316 | chunksz = CHUNKSZ; |
318 | 317 | ||
319 | i = roundup_power2(nmaskbits, CHUNKSZ) - CHUNKSZ; | 318 | i = ALIGN(nmaskbits, CHUNKSZ) - CHUNKSZ; |
320 | for (; i >= 0; i -= CHUNKSZ) { | 319 | for (; i >= 0; i -= CHUNKSZ) { |
321 | chunkmask = ((1ULL << chunksz) - 1); | 320 | chunkmask = ((1ULL << chunksz) - 1); |
322 | word = i / BITS_PER_LONG; | 321 | word = i / BITS_PER_LONG; |