Skip to content

Commit

Permalink
[PATCH] remove powerpc bitops in favor of existing generic bitops
Browse files Browse the repository at this point in the history
There already exists a big endian safe bitops implementation in
lib/find_next_bit.c.  The code in it is 90%+ common with the powerpc
specific version, so the powerpc version is redundant.  This patch
makes the necessary changes to use the generic bitops in powerpc, and
removes the powerpc specific version.

Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Jon Mason authored and Paul Mackerras committed May 24, 2006
1 parent 7499bf1 commit 0a9cb46
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 154 deletions.
4 changes: 4 additions & 0 deletions arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ config GENERIC_CALIBRATE_DELAY
bool
default y

config GENERIC_FIND_NEXT_BIT
bool
default y

config PPC
bool
default y
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ obj-y := string.o strcase.o
obj-$(CONFIG_PPC32) += div64.o copy_32.o checksum_32.o
endif

obj-y += bitops.o
obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \
memcpy_64.o usercopy_64.o mem_64.o string.o \
strcase.o
Expand Down
150 changes: 0 additions & 150 deletions arch/powerpc/lib/bitops.c

This file was deleted.

4 changes: 4 additions & 0 deletions arch/ppc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ config GENERIC_NVRAM
bool
default y

config GENERIC_FIND_NEXT_BIT
bool
default y

config SCHED_NO_NO_OMIT_FRAME_POINTER
bool
default y
Expand Down
6 changes: 3 additions & 3 deletions include/asm-powerpc/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ static __inline__ int test_le_bit(unsigned long nr,
#define __test_and_clear_le_bit(nr, addr) \
__test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))

#define find_first_zero_le_bit(addr, size) find_next_zero_le_bit((addr), (size), 0)
unsigned long find_next_zero_le_bit(const unsigned long *addr,
#define find_first_zero_le_bit(addr, size) generic_find_next_zero_le_bit((addr), (size), 0)
unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,
unsigned long size, unsigned long offset);

/* Bitmap functions for the ext2 filesystem */
Expand All @@ -309,7 +309,7 @@ unsigned long find_next_zero_le_bit(const unsigned long *addr,
#define ext2_find_first_zero_bit(addr, size) \
find_first_zero_le_bit((unsigned long*)addr, size)
#define ext2_find_next_zero_bit(addr, size, off) \
find_next_zero_le_bit((unsigned long*)addr, size, off)
generic_find_next_zero_le_bit((unsigned long*)addr, size, off)

/* Bitmap functions for the minix filesystem. */

Expand Down

0 comments on commit 0a9cb46

Please sign in to comment.