summaryrefslogtreecommitdiffstats
path: root/lib/kfifo.c
diff options
context:
space:
mode:
authorStefani Seibold <stefani@seibold.net>2013-02-27 17:05:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 19:10:23 -0800
commitdfe2a77fd243ac3bf204fd0624e4d0b2134aaa6d (patch)
tree8ec9dd36b30a4cb53138dec2b07bc4a4c79fa49e /lib/kfifo.c
parentc759b35e6469fe7519e9fe45d5285d49f12cb657 (diff)
downloadlinux-stable-dfe2a77fd243ac3bf204fd0624e4d0b2134aaa6d.tar.gz
linux-stable-dfe2a77fd243ac3bf204fd0624e4d0b2134aaa6d.tar.bz2
linux-stable-dfe2a77fd243ac3bf204fd0624e4d0b2134aaa6d.zip
kfifo: fix kfifo_alloc() and kfifo_init()
Fix kfifo_alloc() and kfifo_init() to alloc at least the requested number of elements. Since the kfifo operates on power of 2 the request size will be rounded up to the next power of two. Signed-off-by: Stefani Seibold <stefani@seibold.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/kfifo.c')
-rw-r--r--lib/kfifo.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/kfifo.c b/lib/kfifo.c
index 59dcf5b81d24..7b7f83027b7b 100644
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@ -42,8 +42,7 @@ int __kfifo_alloc(struct __kfifo *fifo, unsigned int size,
* round down to the next power of 2, since our 'let the indices
* wrap' technique works only in this case.
*/
- if (!is_power_of_2(size))
- size = rounddown_pow_of_two(size);
+ size = roundup_pow_of_two(size);
fifo->in = 0;
fifo->out = 0;
@@ -83,8 +82,7 @@ int __kfifo_init(struct __kfifo *fifo, void *buffer,
{
size /= esize;
- if (!is_power_of_2(size))
- size = rounddown_pow_of_two(size);
+ size = roundup_pow_of_two(size);
fifo->in = 0;
fifo->out = 0;