projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sunxi: Use BROM stored boot_media value to determine our boot-source
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
bitops.h
diff --git
a/arch/arm/include/asm/bitops.h
b/arch/arm/include/asm/bitops.h
index 9b78043db719c1ccb9e59f2d5a8f65759e5ddd50..f33efeb33eeb7a785f3902950d53d31da28bc65a 100644
(file)
--- a/
arch/arm/include/asm/bitops.h
+++ b/
arch/arm/include/asm/bitops.h
@@
-51,7
+51,7
@@
static inline int __test_and_set_bit(int nr, volatile void *addr)
static inline int test_and_set_bit(int nr, volatile void * addr)
{
static inline int test_and_set_bit(int nr, volatile void * addr)
{
- unsigned long flags;
+ unsigned long flags
= 0
;
int out;
local_irq_save(flags);
int out;
local_irq_save(flags);
@@
-73,7
+73,7
@@
static inline int __test_and_clear_bit(int nr, volatile void *addr)
static inline int test_and_clear_bit(int nr, volatile void * addr)
{
static inline int test_and_clear_bit(int nr, volatile void * addr)
{
- unsigned long flags;
+ unsigned long flags
= 0
;
int out;
local_irq_save(flags);
int out;
local_irq_save(flags);
@@
-190,4
+190,9
@@
found_middle:
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */
+#include <asm-generic/bitops/__fls.h>
+#include <asm-generic/bitops/__ffs.h>
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/fls64.h>
+
#endif /* _ARM_BITOPS_H */
#endif /* _ARM_BITOPS_H */