diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:43 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:43 +0100 |
commit | 17d85bc7564571a1cce23ffdb2d2a33301876925 (patch) | |
tree | 815bfc3a02e94303c7c834770bf2a17012c10bf8 /lib | |
parent | d95c3578120e5bc4784069439f00ccb1b5f87717 (diff) | |
parent | 041b62374c7fedc11a8a1eeda2868612d3d1436c (diff) |
Merge commit 'v2.6.29-rc8' into cpus4096
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bitmap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/bitmap.c b/lib/bitmap.c index 1338469ac84..35a1f7ff414 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -948,15 +948,15 @@ done: */ int bitmap_find_free_region(unsigned long *bitmap, int bits, int order) { - int pos; /* scans bitmap by regions of size order */ + int pos, end; /* scans bitmap by regions of size order */ - for (pos = 0; pos < bits; pos += (1 << order)) - if (__reg_op(bitmap, pos, order, REG_OP_ISFREE)) - break; - if (pos == bits) - return -ENOMEM; - __reg_op(bitmap, pos, order, REG_OP_ALLOC); - return pos; + for (pos = 0 ; (end = pos + (1 << order)) <= bits; pos = end) { + if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE)) + continue; + __reg_op(bitmap, pos, order, REG_OP_ALLOC); + return pos; + } + return -ENOMEM; } EXPORT_SYMBOL(bitmap_find_free_region); |