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 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
kernel
/
kfifo.c
diff --git
a/kernel/kfifo.c
b/kernel/kfifo.c
index
bc41ad0
..
26539e3
100644
(file)
--- a/
kernel/kfifo.c
+++ b/
kernel/kfifo.c
@@
-72,9
+72,9
@@
struct kfifo *kfifo_alloc(unsigned int size, gfp_t gfp_mask, spinlock_t *lock)
/*
* round up to the next power of 2, since our 'let the indices
/*
* round up to the next power of 2, since our 'let the indices
- * wrap' t
a
chnique works only in this case.
+ * wrap' t
e
chnique works only in this case.
*/
*/
- if (
size & (size - 1
)) {
+ if (
!is_power_of_2(size
)) {
BUG_ON(size > 0x80000000);
size = roundup_pow_of_two(size);
}
BUG_ON(size > 0x80000000);
size = roundup_pow_of_two(size);
}