Commit 95885c8e authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Linus Torvalds

[PATCH] H8/300 build error fix

Because reference of fls becomes error.
Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d1959327
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Copyright 2002, Yoshinori Sato * Copyright 2002, Yoshinori Sato
*/ */
#include <linux/kernel.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/byteorder.h> /* swab32 */ #include <asm/byteorder.h> /* swab32 */
...@@ -181,6 +180,8 @@ H8300_GEN_TEST_BITOP(test_and_change_bit,"bnot") ...@@ -181,6 +180,8 @@ H8300_GEN_TEST_BITOP(test_and_change_bit,"bnot")
#define find_first_zero_bit(addr, size) \ #define find_first_zero_bit(addr, size) \
find_next_zero_bit((addr), (size), 0) find_next_zero_bit((addr), (size), 0)
#define ffs(x) generic_ffs(x)
static __inline__ unsigned long __ffs(unsigned long word) static __inline__ unsigned long __ffs(unsigned long word)
{ {
unsigned long result; unsigned long result;
...@@ -195,9 +196,6 @@ static __inline__ unsigned long __ffs(unsigned long word) ...@@ -195,9 +196,6 @@ static __inline__ unsigned long __ffs(unsigned long word)
return result; return result;
} }
#define ffs(x) generic_ffs(x)
#define fls(x) generic_fls(x)
static __inline__ int find_next_zero_bit (void * addr, int size, int offset) static __inline__ int find_next_zero_bit (void * addr, int size, int offset)
{ {
unsigned long *p = (unsigned long *)(((unsigned long)addr + (offset >> 3)) & ~3); unsigned long *p = (unsigned long *)(((unsigned long)addr + (offset >> 3)) & ~3);
...@@ -407,4 +405,6 @@ static __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned lon ...@@ -407,4 +405,6 @@ static __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned lon
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define fls(x) generic_fls(x)
#endif /* _H8300_BITOPS_H */ #endif /* _H8300_BITOPS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment