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

Commit e465b535 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into cpus4096-v2
parents 7eb19553 5ece5c51

arch/cris/include/asm/bitops.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) 
#define ffs kernel_ffs



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

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

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

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

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

arch/h8300/include/asm/bitops.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static __inline__ unsigned long __ffs(unsigned long word) 
#endif /* __KERNEL__ */



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

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

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



#endif /* _H8300_BITOPS_H */

include/asm-frv/bitops.h

+13 −0
Original line number Diff line number Diff line
@@ -339,6 +339,19 @@ int __ffs(unsigned long x) 
	return 31 - bit;

}



/**

 * __fls - find last (most-significant) set bit in a long word

 * @word: the word to search

 *

 * Undefined if no set bit exists, so code should check against 0 first.

 */

static inline unsigned long __fls(unsigned long word)

{

	unsigned long bit;

	asm("scan %1,gr0,%0" : "=r"(bit) : "r"(word));

	return bit;

}



/*

 * special slimline version of fls() for calculating ilog2_u32()

 * - note: no protection against n == 0

include/asm-m32r/bitops.h

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr) 
#include <asm-generic/bitops/ffz.h>

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

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

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

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



#ifdef __KERNEL__

include/asm-mn10300/bitops.h

+11 −0
Original line number Diff line number Diff line
@@ -195,6 +195,17 @@ int fls(int x) 
	return (x != 0) ? __ilog2_u32(x) + 1 : 0;

}



/**

 * __fls - find last (most-significant) set bit in a long word

 * @word: the word to search

 *

 * Undefined if no set bit exists, so code should check against 0 first.

 */

static inline unsigned long __fls(unsigned long word)

{

	return __ilog2_u32(word);

}



/**

 * ffs - find first bit set

 * @x: the word to search