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 git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[pandora-kernel.git]
/
include
/
asm-powerpc
/
bitops.h
diff --git
a/include/asm-powerpc/bitops.h
b/include/asm-powerpc/bitops.h
index
a99a749
..
897eade
100644
(file)
--- a/
include/asm-powerpc/bitops.h
+++ b/
include/asm-powerpc/bitops.h
@@
-313,6
+313,11
@@
static __inline__ int fls(unsigned int x)
return 32 - lz;
}
+static __inline__ unsigned long __fls(unsigned long x)
+{
+ return __ilog2(x);
+}
+
/*
* 64-bit can do this using one cntlzd (count leading zeroes doubleword)
* instruction; for 32-bit we use the generic version, which does two