summaryrefslogtreecommitdiff
path: root/arch/microblaze/include/asm/bitops.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-09 08:47:25 -0700
committerTom Rini <trini@ti.com>2012-11-09 08:47:25 -0700
commit59852d03867108217fe88e3bfc3e1e9cedfe63c5 (patch)
tree22eef109c0ce8eb99d80a5be21fab2d19f5b787a /arch/microblaze/include/asm/bitops.h
parent22b6fcb50d06ee281a338e78f8d0a7c9ddee8629 (diff)
parentb3e5cd17f6e180642efafb20bcda948c3cbcff10 (diff)
downloadolio-uboot-2014.01-59852d03867108217fe88e3bfc3e1e9cedfe63c5.tar.xz
olio-uboot-2014.01-59852d03867108217fe88e3bfc3e1e9cedfe63c5.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/microblaze/include/asm/bitops.h')
-rw-r--r--arch/microblaze/include/asm/bitops.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h
index e8c835f7c..eafa2b576 100644
--- a/arch/microblaze/include/asm/bitops.h
+++ b/arch/microblaze/include/asm/bitops.h
@@ -319,7 +319,8 @@ extern __inline__ int ext2_test_bit(int nr, const volatile void * addr)
#define ext2_find_first_zero_bit(addr, size) \
ext2_find_next_zero_bit((addr), (size), 0)
-extern __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
+static inline unsigned long ext2_find_next_zero_bit(void *addr,
+ unsigned long size, unsigned long offset)
{
unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
unsigned long result = offset & ~31UL;