Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f33e2fba authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

[PATCH] bitops: x86_64: use generic bitops 



- remove sched_find_first_bit()
- remove generic_hweight{64,32,16,8}()
- remove ext2_{set,clear,test,find_first_zero,find_next_zero}_bit()
- remove minix_{test,set,test_and_clear,test,find_first_zero}_bit()

Signed-off-by: default avatarAkinobu Mita <mita@miraclelinux.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a58259cd

arch/x86_64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ config RWSEM_GENERIC_SPINLOCK 
config RWSEM_XCHGADD_ALGORITHM

	bool



config GENERIC_HWEIGHT

	bool

	default y



config GENERIC_CALIBRATE_DELAY

	bool

	default y

include/asm-x86_64/bitops.h

+6 −36
Original line number Diff line number Diff line
@@ -356,14 +356,7 @@ static __inline__ unsigned long __fls(unsigned long word) 


#ifdef __KERNEL__



static inline int sched_find_first_bit(const unsigned long *b)

{

	if (b[0])

		return __ffs(b[0]);

	if (b[1])

		return __ffs(b[1]) + 64;

	return __ffs(b[2]) + 128;

}

#include <asm-generic/bitops/sched.h>



/**

 * ffs - find first bit set
@@ -412,43 +405,20 @@ static __inline__ int fls(int x) 
	return r+1;

}



/**

 * hweightN - returns the hamming weight of a N-bit word

 * @x: the word to weigh

 *

 * The Hamming Weight of a number is the total number of bits set in it.

 */



#define hweight64(x) generic_hweight64(x)

#define hweight32(x) generic_hweight32(x)

#define hweight16(x) generic_hweight16(x)

#define hweight8(x) generic_hweight8(x)

#include <asm-generic/bitops/hweight.h>



#endif /* __KERNEL__ */



#ifdef __KERNEL__



#define ext2_set_bit(nr,addr) \

	__test_and_set_bit((nr),(unsigned long*)addr)

#include <asm-generic/bitops/ext2-non-atomic.h>



#define ext2_set_bit_atomic(lock,nr,addr) \

	        test_and_set_bit((nr),(unsigned long*)addr)

#define ext2_clear_bit(nr, addr) \

	__test_and_clear_bit((nr),(unsigned long*)addr)

#define ext2_clear_bit_atomic(lock,nr,addr) \

	        test_and_clear_bit((nr),(unsigned long*)addr)

#define ext2_test_bit(nr, addr)      test_bit((nr),(unsigned long*)addr)

#define ext2_find_first_zero_bit(addr, size) \

	find_first_zero_bit((unsigned long*)addr, size)

#define ext2_find_next_zero_bit(addr, size, off) \

	find_next_zero_bit((unsigned long*)addr, size, off)



/* Bitmap functions for the minix filesystem.  */

#define minix_test_and_set_bit(nr,addr) __test_and_set_bit(nr,(void*)addr)

#define minix_set_bit(nr,addr) __set_bit(nr,(void*)addr)

#define minix_test_and_clear_bit(nr,addr) __test_and_clear_bit(nr,(void*)addr)

#define minix_test_bit(nr,addr) test_bit(nr,(void*)addr)

#define minix_find_first_zero_bit(addr,size) \

	find_first_zero_bit((void*)addr,size)



#include <asm-generic/bitops/minix.h>



#endif /* __KERNEL__ */