summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 06:29:58 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 06:29:58 +0100
commit7afe16c2bbf065e30d692423ad2c7e77c4cfe9a5 (patch)
tree1a6b4e6a3ccbd5dcd462f1eaa05e349e9c9945f9 /lib
parent2084e0225ed14cc1959c8aa703a3870c95fde4ab (diff)
parent041b62374c7fedc11a8a1eeda2868612d3d1436c (diff)
downloadlinux-7afe16c2bbf065e30d692423ad2c7e77c4cfe9a5.tar.gz
linux-7afe16c2bbf065e30d692423ad2c7e77c4cfe9a5.tar.bz2
linux-7afe16c2bbf065e30d692423ad2c7e77c4cfe9a5.zip
Merge commit 'v2.6.29-rc8' into tracing/ftrace
Diffstat (limited to 'lib')
-rw-r--r--lib/bitmap.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 1338469ac849..35a1f7ff4149 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);