git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
kernel
/
kfifo.c
diff --git
a/kernel/kfifo.c
b/kernel/kfifo.c
index
cee4191
..
bc41ad0
100644
(file)
--- a/
kernel/kfifo.c
+++ b/
kernel/kfifo.c
@@
-24,6
+24,7
@@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/kfifo.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/kfifo.h>
+#include <linux/log2.h>
/**
* kfifo_init - allocates a new FIFO using a preallocated buffer
/**
* kfifo_init - allocates a new FIFO using a preallocated buffer
@@
-41,7
+42,7
@@
struct kfifo *kfifo_init(unsigned char *buffer, unsigned int size,
struct kfifo *fifo;
/* size must be a power of 2 */
struct kfifo *fifo;
/* size must be a power of 2 */
- BUG_ON(
size & (size - 1
));
+ BUG_ON(
!is_power_of_2(size
));
fifo = kmalloc(sizeof(struct kfifo), gfp_mask);
if (!fifo)
fifo = kmalloc(sizeof(struct kfifo), gfp_mask);
if (!fifo)