2004-11-10 04:55:26

by Yoshinori Sato

[permalink] [raw]
Subject: [PATCH] H8/300 build error fix

Because reference of fls becomes error.

Signed-off-by: Yoshinori Sato <[email protected]>

diff -Nru a/include/asm-h8300/bitops.h b/include/asm-h8300/bitops.h
--- a/include/asm-h8300/bitops.h 2004-11-10 01:06:35 +09:00
+++ b/include/asm-h8300/bitops.h 2004-11-10 01:06:35 +09:00
@@ -6,7 +6,6 @@
* Copyright 2002, Yoshinori Sato
*/

-#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/compiler.h>
#include <asm/byteorder.h> /* swab32 */
@@ -181,6 +180,8 @@
#define find_first_zero_bit(addr, size) \
find_next_zero_bit((addr), (size), 0)

+#define ffs(x) generic_ffs(x)
+
static __inline__ unsigned long __ffs(unsigned long word)
{
unsigned long result;
@@ -195,9 +196,6 @@
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)
{
unsigned long *p = (unsigned long *)(((unsigned long)addr + (offset >> 3)) & ~3);
@@ -406,5 +404,7 @@
#define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)

#endif /* __KERNEL__ */
+
+#define fls(x) generic_fls(x)

#endif /* _H8300_BITOPS_H */

--
Yoshinori Sato
<[email protected]>