From: Anton Blanchard <anton@samba.org>
- export find_next_bit and move the other exports here
- fix a few minor style issues
---
25-akpm/arch/ppc64/kernel/bitops.c | 22 ++++++++++++++--------
25-akpm/arch/ppc64/kernel/ppc_ksyms.c | 3 ---
2 files changed, 14 insertions(+), 11 deletions(-)
diff -puN arch/ppc64/kernel/bitops.c~ppc64-bitops_exports arch/ppc64/kernel/bitops.c
--- 25/arch/ppc64/kernel/bitops.c~ppc64-bitops_exports 2004-03-14 15:35:06.364970960 -0800
+++ 25-akpm/arch/ppc64/kernel/bitops.c 2004-03-14 15:35:06.367970504 -0800
@@ -3,6 +3,7 @@
*/
#include <linux/kernel.h>
+#include <linux/module.h>
#include <asm/bitops.h>
#include <asm/byteorder.h>
@@ -44,8 +45,10 @@ found_first:
found_middle:
return result + ffz(tmp);
}
-
-unsigned long find_next_bit(unsigned long *addr, unsigned long size, unsigned long offset)
+EXPORT_SYMBOL(find_next_zero_bit);
+
+unsigned long find_next_bit(unsigned long *addr, unsigned long size,
+ unsigned long offset)
{
unsigned long *p = addr + (offset >> 6);
unsigned long result = offset & ~63UL;
@@ -82,8 +85,9 @@ found_first:
found_middle:
return result + __ffs(tmp);
}
+EXPORT_SYMBOL(find_next_bit);
-static __inline__ unsigned int ext2_ilog2(unsigned int x)
+static inline unsigned int ext2_ilog2(unsigned int x)
{
int lz;
@@ -91,16 +95,17 @@ static __inline__ unsigned int ext2_ilog
return 31 - lz;
}
-static __inline__ unsigned int ext2_ffz(unsigned int x)
+static inline unsigned int ext2_ffz(unsigned int x)
{
- u32 tempRC;
+ u32 rc;
if ((x = ~x) == 0)
return 32;
- tempRC = ext2_ilog2(x & -x);
- return tempRC;
+ rc = ext2_ilog2(x & -x);
+ return rc;
}
-unsigned long find_next_zero_le_bit(unsigned long *addr, unsigned long size, unsigned long offset)
+unsigned long find_next_zero_le_bit(unsigned long *addr, unsigned long size,
+ unsigned long offset)
{
unsigned int *p = ((unsigned int *) addr) + (offset >> 5);
unsigned int result = offset & ~31;
@@ -136,3 +141,4 @@ found_first:
found_middle:
return result + ext2_ffz(tmp);
}
+EXPORT_SYMBOL(find_next_zero_le_bit);
diff -puN arch/ppc64/kernel/ppc_ksyms.c~ppc64-bitops_exports arch/ppc64/kernel/ppc_ksyms.c
--- 25/arch/ppc64/kernel/ppc_ksyms.c~ppc64-bitops_exports 2004-03-14 15:35:06.365970808 -0800
+++ 25-akpm/arch/ppc64/kernel/ppc_ksyms.c 2004-03-14 15:35:06.367970504 -0800
@@ -55,9 +55,6 @@ EXPORT_SYMBOL(sys_ioctl);
EXPORT_SYMBOL(isa_io_base);
EXPORT_SYMBOL(pci_io_base);
-EXPORT_SYMBOL(find_next_zero_bit);
-EXPORT_SYMBOL(find_next_zero_le_bit);
-
EXPORT_SYMBOL(strcpy);
EXPORT_SYMBOL(strncpy);
EXPORT_SYMBOL(strcat);
_