lkml.org 
[lkml]   [2011]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 06/27] powerpc: introduce little-endian bitops
    Date
    Introduce little-endian bit operations by renaming existing powerpc
    native little-endian bit operations and changing them to take any
    pointer types.

    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: linuxppc-dev@lists.ozlabs.org
    ---

    Change from v4:
    - change the prototypes and add casts in the macro to take any pointer types

    The whole series is available in the git branch at:
    git://git.kernel.org/pub/scm/linux/kernel/git/mita/linux-2.6.git le-bitops-v5

    arch/powerpc/include/asm/bitops.h | 46 ++++++++++++++++++------------------
    1 files changed, 23 insertions(+), 23 deletions(-)

    diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
    index db567ed..a77f6be 100644
    --- a/arch/powerpc/include/asm/bitops.h
    +++ b/arch/powerpc/include/asm/bitops.h
    @@ -281,27 +281,27 @@ unsigned long __arch_hweight64(__u64 w);

    /* Little-endian versions */

    -static __inline__ int test_le_bit(unsigned long nr,
    - __const__ unsigned long *addr)
    +static __inline__ int test_bit_le(unsigned long nr,
    + __const__ void *addr)
    {
    __const__ unsigned char *tmp = (__const__ unsigned char *) addr;
    return (tmp[nr >> 3] >> (nr & 7)) & 1;
    }

    -#define __set_le_bit(nr, addr) \
    - __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
    -#define __clear_le_bit(nr, addr) \
    - __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
    +#define __set_bit_le(nr, addr) \
    + __set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))
    +#define __clear_bit_le(nr, addr) \
    + __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))

    -#define test_and_set_le_bit(nr, addr) \
    - test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
    -#define test_and_clear_le_bit(nr, addr) \
    - test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
    +#define test_and_set_bit_le(nr, addr) \
    + test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))
    +#define test_and_clear_bit_le(nr, addr) \
    + test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))

    -#define __test_and_set_le_bit(nr, addr) \
    - __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
    -#define __test_and_clear_le_bit(nr, addr) \
    - __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
    +#define __test_and_set_bit_le(nr, addr) \
    + __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))
    +#define __test_and_clear_bit_le(nr, addr) \
    + __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))

    #define find_first_zero_bit_le(addr, size) \
    find_next_zero_bit_le((addr), (size), 0)
    @@ -313,16 +313,16 @@ unsigned long find_next_bit_le(const void *addr,
    /* Bitmap functions for the ext2 filesystem */

    #define ext2_set_bit(nr,addr) \
    - __test_and_set_le_bit((nr), (unsigned long*)addr)
    + __test_and_set_bit_le((nr), (unsigned long*)addr)
    #define ext2_clear_bit(nr, addr) \
    - __test_and_clear_le_bit((nr), (unsigned long*)addr)
    + __test_and_clear_bit_le((nr), (unsigned long*)addr)

    #define ext2_set_bit_atomic(lock, nr, addr) \
    - test_and_set_le_bit((nr), (unsigned long*)addr)
    + test_and_set_bit_le((nr), (unsigned long*)addr)
    #define ext2_clear_bit_atomic(lock, nr, addr) \
    - test_and_clear_le_bit((nr), (unsigned long*)addr)
    + test_and_clear_bit_le((nr), (unsigned long*)addr)

    -#define ext2_test_bit(nr, addr) test_le_bit((nr),(unsigned long*)addr)
    +#define ext2_test_bit(nr, addr) test_bit_le((nr),(unsigned long*)addr)

    #define ext2_find_first_zero_bit(addr, size) \
    find_first_zero_bit_le((unsigned long*)addr, size)
    @@ -334,13 +334,13 @@ unsigned long find_next_bit_le(const void *addr,
    /* Bitmap functions for the minix filesystem. */

    #define minix_test_and_set_bit(nr,addr) \
    - __test_and_set_le_bit(nr, (unsigned long *)addr)
    + __test_and_set_bit_le(nr, (unsigned long *)addr)
    #define minix_set_bit(nr,addr) \
    - __set_le_bit(nr, (unsigned long *)addr)
    + __set_bit_le(nr, (unsigned long *)addr)
    #define minix_test_and_clear_bit(nr,addr) \
    - __test_and_clear_le_bit(nr, (unsigned long *)addr)
    + __test_and_clear_bit_le(nr, (unsigned long *)addr)
    #define minix_test_bit(nr,addr) \
    - test_le_bit(nr, (unsigned long *)addr)
    + test_bit_le(nr, (unsigned long *)addr)

    #define minix_find_first_zero_bit(addr,size) \
    find_first_zero_bit_le((unsigned long *)addr, size)
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-01-22 14:19    [W:0.035 / U:1.240 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site