From cb46b4beb04495e2ac4cfe8194712d281b8a3a80 Mon Sep 17 00:00:00 2001 From: Thomas Bogendoerfer Date: Sun, 4 May 2008 00:25:02 +0200 Subject: [PATCH] --- yaml --- r: 96429 b: refs/heads/master c: fcd84f2fca49166dab2dba259eca6e633585763f h: refs/heads/master i: 96427: 6da04ecad3f123e3c70ce2eba6576545d5a1e202 v: v3 --- [refs] | 2 +- trunk/include/asm-mips/bitops.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4f99743ad9f0..df46763d9560 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ff83f21d23d17b63bbb984fee5d12aa5a8066b3 +refs/heads/master: fcd84f2fca49166dab2dba259eca6e633585763f diff --git a/trunk/include/asm-mips/bitops.h b/trunk/include/asm-mips/bitops.h index c2bd126c3b4e..5e1f590a24a1 100644 --- a/trunk/include/asm-mips/bitops.h +++ b/trunk/include/asm-mips/bitops.h @@ -558,6 +558,8 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long * __clear_bit(nr, addr); } +#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) + /* * Return the bit position (0..63) of the most significant 1 bit in a word * Returns -1 if no 1 bit exists @@ -596,8 +598,6 @@ static inline unsigned long __fls(unsigned long x) return __ilog2(x); } -#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) - /* * __ffs - find first bit in word. * @word: The word to search @@ -654,6 +654,7 @@ static inline int ffs(int word) #else #include +#include #include #include #include