diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-11-12 17:13:26 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-11-12 17:13:26 +0100 |
| commit | 5f5620ab2679608f94b3a77e51c77d0a770103bd (patch) | |
| tree | ec983c06d2f62384909968bb870add121b8a1502 /arch/m68k/include/asm/bitops.h | |
| parent | 78e9ca52edaab74ad645d719676ff4c24d2f462c (diff) | |
| parent | 038be18fd95aa6283eafb85ceabc0b880976424b (diff) | |
| download | u-boot-5f5620ab2679608f94b3a77e51c77d0a770103bd.tar.gz | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/m68k/include/asm/bitops.h')
| -rw-r--r-- | arch/m68k/include/asm/bitops.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index f9c434b4a3..4a3f6b97ad 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -6,25 +6,28 @@ #define _M68K_BITOPS_H #include <asm/byteorder.h> +#include <asm-generic/bitops/fls.h> +#include <asm-generic/bitops/__fls.h> +#include <asm-generic/bitops/fls64.h> +#include <asm-generic/bitops/__ffs.h> extern void set_bit(int nr, volatile void *addr); extern void clear_bit(int nr, volatile void *addr); extern void change_bit(int nr, volatile void *addr); -extern int test_and_set_bit(int nr, volatile void *addr); extern int test_and_clear_bit(int nr, volatile void *addr); extern int test_and_change_bit(int nr, volatile void *addr); #ifdef __KERNEL__ -extern inline int test_bit(int nr, __const__ volatile void *addr) +static inline int test_bit(int nr, __const__ volatile void *addr) { __const__ unsigned int *p = (__const__ unsigned int *) addr; return (p[nr >> 5] & (1UL << (nr & 31))) != 0; } -extern inline int test_and_set_bit(int nr, volatile void *vaddr) +static inline int test_and_set_bit(int nr, volatile void *vaddr) { char retval; |