lkml.org 
[lkml]   [2009]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/15] asm-generic: make bitops.h usable
    Date
    bitops.h apparently suffered from some level of bitrot, it
    was missing the smp_mb__{before,after}_clear_bit functions,
    and included other headers in an invalid order.

    This changes the file so that new architectures can use
    it out of the box.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Remis Lima Baima <remis.developer@googlemail.com>
    ---
    include/asm-generic/bitops.h | 24 ++++++++++++++++++------
    1 files changed, 18 insertions(+), 6 deletions(-)

    diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h
    index c9f369c..a54f442 100644
    --- a/include/asm-generic/bitops.h
    +++ b/include/asm-generic/bitops.h
    @@ -1,19 +1,29 @@
    -#ifndef _ASM_GENERIC_BITOPS_H_
    -#define _ASM_GENERIC_BITOPS_H_
    +#ifndef __ASM_GENERIC_BITOPS_H
    +#define __ASM_GENERIC_BITOPS_H

    /*
    * For the benefit of those who are trying to port Linux to another
    * architecture, here are some C-language equivalents. You should
    * recode these in the native assembly language, if at all possible.
    - *
    + *
    * C language equivalents written by Theodore Ts'o, 9/26/92
    */

    -#include <asm-generic/bitops/atomic.h>
    -#include <asm-generic/bitops/non-atomic.h>
    +#include <linux/irqflags.h>
    +#include <linux/compiler.h>
    +
    +/*
    + * clear_bit may not imply a memory barrier
    + */
    +#ifndef smp_mb__before_clear_bit
    +#define smp_mb__before_clear_bit() smp_mb()
    +#define smp_mb__after_clear_bit() smp_mb()
    +#endif
    +
    #include <asm-generic/bitops/__ffs.h>
    #include <asm-generic/bitops/ffz.h>
    #include <asm-generic/bitops/fls.h>
    +#include <asm-generic/bitops/__fls.h>
    #include <asm-generic/bitops/fls64.h>
    #include <asm-generic/bitops/find.h>

    @@ -26,8 +36,10 @@
    #include <asm-generic/bitops/hweight.h>
    #include <asm-generic/bitops/lock.h>

    +#include <asm-generic/bitops/atomic.h>
    +#include <asm-generic/bitops/non-atomic.h>
    #include <asm-generic/bitops/ext2-non-atomic.h>
    #include <asm-generic/bitops/ext2-atomic.h>
    #include <asm-generic/bitops/minix.h>

    -#endif /* _ASM_GENERIC_BITOPS_H */
    +#endif /* __ASM_GENERIC_BITOPS_H */
    --
    1.6.0.4


    \
     
     \ /
      Last update: 2009-05-14 01:05    [W:0.023 / U:31.656 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site