diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-05-28 09:45:17 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-05-28 09:45:17 +0200 |
commit | 9a9a767ab516e4c5a3fa1ba3151efb461e7846f1 (patch) | |
tree | 4a226ba0486477d744fa9884c3907f89f822309d /lib/bitmap.c | |
parent | fa9e355c6e40b3c2c91121780efb724722ec7ece (diff) | |
parent | 9dda696f0de87a2e5cfabb147e28c76b7d3c6846 (diff) |
Merge branch 'linus' into auto-latest
Conflicts:
Documentation/feature-removal-schedule.txt
kernel/Makefile
Diffstat (limited to 'lib/bitmap.c')
-rw-r--r-- | lib/bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bitmap.c b/lib/bitmap.c index ffb78c916ccd..d7137e7e06e8 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -672,7 +672,7 @@ static int bitmap_pos_to_ord(const unsigned long *buf, int pos, int bits) * * The bit positions 0 through @bits are valid positions in @buf. */ -static int bitmap_ord_to_pos(const unsigned long *buf, int ord, int bits) +int bitmap_ord_to_pos(const unsigned long *buf, int ord, int bits) { int pos = 0; |