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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
include
/
linux
/
log2.h
diff --git
a/include/linux/log2.h
b/include/linux/log2.h
index
57e641e
..
1b8a2c1
100644
(file)
--- a/
include/linux/log2.h
+++ b/
include/linux/log2.h
@@
-159,7
+159,7
@@
unsigned long __roundup_pow_of_two(unsigned long n)
#define roundup_pow_of_two(n) \
( \
__builtin_constant_p(n) ? ( \
- (n == 1) ?
0
: \
+ (n == 1) ?
1
: \
(1UL << (ilog2((n) - 1) + 1)) \
) : \
__roundup_pow_of_two(n) \