Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 252076
b: refs/heads/master
c: 04b18ff
h: refs/heads/master
v: v3
  • Loading branch information
Akinobu Mita authored and Linus Torvalds committed May 27, 2011
1 parent 6abfdaf commit ab7c441
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 39 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 63e424c84429903c92a0f1e9654c31ccaf6694d0
refs/heads/master: 04b18ff9ca69545a2447462a65c7ba5373e23f69
43 changes: 5 additions & 38 deletions trunk/arch/arm/include/asm/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
#define find_first_bit(p,sz) _find_first_bit_le(p,sz)
#define find_next_bit(p,sz,off) _find_next_bit_le(p,sz,off)

#define WORD_BITOFF_TO_LE(x) ((x))

#else
/*
* These are the big endian, atomic definitions.
Expand All @@ -214,8 +212,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
#define find_first_bit(p,sz) _find_first_bit_be(p,sz)
#define find_next_bit(p,sz,off) _find_next_bit_be(p,sz,off)

#define WORD_BITOFF_TO_LE(x) ((x) ^ 0x18)

#endif

#if __LINUX_ARM_ARCH__ < 5
Expand Down Expand Up @@ -287,40 +283,7 @@ static inline int fls(int x)
#include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/lock.h>

static inline void __set_bit_le(int nr, void *addr)
{
__set_bit(WORD_BITOFF_TO_LE(nr), addr);
}

static inline void __clear_bit_le(int nr, void *addr)
{
__clear_bit(WORD_BITOFF_TO_LE(nr), addr);
}

static inline int __test_and_set_bit_le(int nr, void *addr)
{
return __test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr);
}

static inline int test_and_set_bit_le(int nr, void *addr)
{
return test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr);
}

static inline int __test_and_clear_bit_le(int nr, void *addr)
{
return __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr);
}

static inline int test_and_clear_bit_le(int nr, void *addr)
{
return test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr);
}

static inline int test_bit_le(int nr, const void *addr)
{
return test_bit(WORD_BITOFF_TO_LE(nr), addr);
}
#ifdef __ARMEB__

static inline int find_first_zero_bit_le(const void *p, unsigned size)
{
Expand All @@ -340,6 +303,10 @@ static inline int find_next_bit_le(const void *p, int size, int offset)
}
#define find_next_bit_le find_next_bit_le

#endif

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

/*
* Ext2 is defined to use little-endian byte ordering.
*/
Expand Down

0 comments on commit ab7c441

Please sign in to comment.