redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge commit 'v2.6.29-rc8' into tracing/ftrace

Browse source
This commit is contained in:
Ingo Molnar 2009-03-13 06:29:58 +01:00
parent 2084e0225e 041b62374c
commit 7afe16c2bb
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 29 SUBLEVEL = 29
EXTRAVERSION = -rc7 EXTRAVERSION = -rc8
NAME = Erotic Pickled Herring NAME = Erotic Pickled Herring
# *DOCUMENTATION* # *DOCUMENTATION*

16
lib/bitmap.c
View file

@ -948,15 +948,15 @@ done:
*/ */
int bitmap_find_free_region(unsigned long *bitmap, int bits, int order) 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)) for (pos = 0 ; (end = pos + (1 << order)) <= bits; pos = end) {
if (__reg_op(bitmap, pos, order, REG_OP_ISFREE)) if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
break; continue;
if (pos == bits) __reg_op(bitmap, pos, order, REG_OP_ALLOC);
return -ENOMEM; return pos;
__reg_op(bitmap, pos, order, REG_OP_ALLOC); }
return pos; return -ENOMEM;
} }
EXPORT_SYMBOL(bitmap_find_free_region); EXPORT_SYMBOL(bitmap_find_free_region);