[PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h - Kernel

This is a discussion on [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h - Kernel ; From: Huang Ying asm/atomic.h contains both declaration and implementation of atomic_t. So there are some implementation related files included in asm/atomic.h. And atomic_t is a typedef. Combination of above makes it impossible to use atomic_t in files included by atomic.h. ...

+ Reply to Thread
Results 1 to 9 of 9

Thread: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

  1. [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    From: Huang Ying

    asm/atomic.h contains both declaration and implementation of atomic_t. So
    there are some implementation related files included in asm/atomic.h. And
    atomic_t is a typedef. Combination of above makes it impossible to use
    atomic_t in files included by atomic.h. Such as atomic_t can not be used
    in linux/kernel.h on i386, because it is included by asm/atomic.h.

    It is reasonable to separate declaration from implementation. So a new
    file atomic_types.h is added for every architecture to accommodate the
    declaration of atomic_t.

    Includes fixes from Andrew Moton.

    Signed-off-by: Huang Ying
    Reviewed-by: Ingo Molnar

    ---

    arch/alpha/include/asm/atomic.h | 10 +---------
    arch/alpha/include/asm/atomic_types.h | 13 +++++++++++++
    arch/arm/include/asm/atomic.h | 3 +--
    arch/arm/include/asm/atomic_types.h | 6 ++++++
    arch/avr32/include/asm/atomic.h | 2 +-
    arch/avr32/include/asm/atomic_types.h | 6 ++++++
    arch/blackfin/include/asm/atomic.h | 4 +---
    arch/blackfin/include/asm/atomic_types.h | 8 ++++++++
    arch/h8300/include/asm/atomic.h | 3 ++-
    arch/h8300/include/asm/atomic_types.h | 6 ++++++
    arch/ia64/include/asm/atomic.h | 8 +-------
    arch/ia64/include/asm/atomic_types.h | 11 +++++++++++
    arch/m68knommu/include/asm/atomic.h | 2 +-
    arch/m68knommu/include/asm/atomic_types.h | 6 ++++++
    arch/mips/include/asm/atomic.h | 3 +--
    arch/mips/include/asm/atomic_types.h | 6 ++++++
    arch/powerpc/include/asm/atomic.h | 2 +-
    arch/powerpc/include/asm/atomic_types.h | 6 ++++++
    arch/s390/include/asm/atomic.h | 4 +---
    arch/s390/include/asm/atomic_types.h | 8 ++++++++
    arch/sh/include/asm/atomic.h | 2 +-
    arch/sh/include/asm/atomic_types.h | 8 ++++++++
    arch/sparc/include/asm/atomic_32.h | 4 ++--
    arch/sparc/include/asm/atomic_64.h | 2 +-
    arch/sparc/include/asm/atomic_types.h | 8 ++++++++
    include/asm-cris/atomic.h | 3 +--
    include/asm-cris/atomic_types.h | 6 ++++++
    include/asm-frv/atomic.h | 5 +----
    include/asm-frv/atomic_types.h | 8 ++++++++
    include/asm-m32r/atomic.h | 8 +-------
    include/asm-m32r/atomic_types.h | 11 +++++++++++
    include/asm-m68k/atomic.h | 2 +-
    include/asm-m68k/atomic_types.h | 6 ++++++
    include/asm-mn10300/atomic.h | 11 ++---------
    include/asm-mn10300/atomic_types.h | 13 +++++++++++++
    include/asm-um/atomic_types.h | 6 ++++++
    include/asm-x86/atomic_32.h | 10 +---------
    include/asm-x86/atomic_64.h | 10 +---------
    include/asm-x86/atomic_types.h | 13 +++++++++++++
    include/asm-xtensa/atomic.h | 3 +--
    include/asm-xtensa/atomic_types.h | 6 ++++++
    41 files changed, 185 insertions(+), 77 deletions(-)

    --- a/arch/alpha/include/asm/atomic.h
    +++ b/arch/alpha/include/asm/atomic.h
    @@ -3,6 +3,7 @@

    #include
    #include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    @@ -12,15 +13,6 @@
    * than regular operations.
    */

    -
    -/*
    - * Counter is volatile to make sure gcc doesn't try to be clever
    - * and move things around on us. We need to use _exactly_ the address
    - * the user gave us, not some alias that contains the same information.
    - */
    -typedef struct { volatile int counter; } atomic_t;
    -typedef struct { volatile long counter; } atomic64_t;
    -
    #define ATOMIC_INIT(i) ( (atomic_t) { (i) } )
    #define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )

    --- a/arch/arm/include/asm/atomic.h
    +++ b/arch/arm/include/asm/atomic.h
    @@ -13,8 +13,7 @@

    #include
    #include
    -
    -typedef struct { volatile int counter; } atomic_t;
    +#include

    #define ATOMIC_INIT(i) { (i) }

    --- a/arch/avr32/include/asm/atomic.h
    +++ b/arch/avr32/include/asm/atomic.h
    @@ -15,8 +15,8 @@
    #define __ASM_AVR32_ATOMIC_H

    #include
    +#include

    -typedef struct { volatile int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    --- a/arch/blackfin/include/asm/atomic.h
    +++ b/arch/blackfin/include/asm/atomic.h
    @@ -2,6 +2,7 @@
    #define __ARCH_BLACKFIN_ATOMIC__

    #include /* local_irq_XXX() */
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    @@ -13,9 +14,6 @@
    * Tony Kou (tonyko@lineo.ca) Lineo Inc. 2001
    */

    -typedef struct {
    - int counter;
    -} atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    --- a/arch/h8300/include/asm/atomic.h
    +++ b/arch/h8300/include/asm/atomic.h
    @@ -1,12 +1,13 @@
    #ifndef __ARCH_H8300_ATOMIC__
    #define __ARCH_H8300_ATOMIC__

    +#include
    +
    /*
    * Atomic operations that C can't guarantee us. Useful for
    * resource counting etc..
    */

    -typedef struct { int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    --- a/arch/ia64/include/asm/atomic.h
    +++ b/arch/ia64/include/asm/atomic.h
    @@ -16,13 +16,7 @@

    #include
    #include
    -
    -/*
    - * On IA-64, counter must always be volatile to ensure that that the
    - * memory accesses are ordered.
    - */
    -typedef struct { volatile __s32 counter; } atomic_t;
    -typedef struct { volatile __s64 counter; } atomic64_t;
    +#include

    #define ATOMIC_INIT(i) ((atomic_t) { (i) })
    #define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
    --- a/arch/m68knommu/include/asm/atomic.h
    +++ b/arch/m68knommu/include/asm/atomic.h
    @@ -2,6 +2,7 @@
    #define __ARCH_M68KNOMMU_ATOMIC__

    #include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    @@ -12,7 +13,6 @@
    * We do not have SMP m68k systems, so we don't have to deal with that.
    */

    -typedef struct { int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    --- a/arch/mips/include/asm/atomic.h
    +++ b/arch/mips/include/asm/atomic.h
    @@ -19,8 +19,7 @@
    #include
    #include
    #include
    -
    -typedef struct { volatile int counter; } atomic_t;
    +#include

    #define ATOMIC_INIT(i) { (i) }

    --- a/arch/powerpc/include/asm/atomic.h
    +++ b/arch/powerpc/include/asm/atomic.h
    @@ -5,7 +5,7 @@
    * PowerPC atomic operations
    */

    -typedef struct { int counter; } atomic_t;
    +#include

    #ifdef __KERNEL__
    #include
    --- a/arch/s390/include/asm/atomic.h
    +++ b/arch/s390/include/asm/atomic.h
    @@ -2,6 +2,7 @@
    #define __ARCH_S390_ATOMIC__

    #include
    +#include

    /*
    * include/asm-s390/atomic.h
    @@ -23,9 +24,6 @@
    * S390 uses 'Compare And Swap' for atomicity in SMP enviroment
    */

    -typedef struct {
    - int counter;
    -} __attribute__ ((aligned (4))) atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #ifdef __KERNEL__
    --- /dev/null
    +++ b/arch/alpha/include/asm/atomic_types.h
    @@ -0,0 +1,13 @@
    +#ifndef _ALPHA_ATOMIC_TYPES_H
    +#define _ALPHA_ATOMIC_TYPES_H
    +
    +
    +/*
    + * Counter is volatile to make sure gcc doesn't try to be clever
    + * and move things around on us. We need to use _exactly_ the address
    + * the user gave us, not some alias that contains the same information.
    + */
    +typedef struct { volatile int counter; } atomic_t;
    +typedef struct { volatile long counter; } atomic64_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/arm/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ASM_ARM_ATOMIC_TYPES_H
    +#define __ASM_ARM_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/avr32/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ASM_AVR32_ATOMIC_TYPES_H
    +#define __ASM_AVR32_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/blackfin/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef __ARCH_BLACKFIN_ATOMIC_TYPES__
    +#define __ARCH_BLACKFIN_ATOMIC_TYPES__
    +
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    --- a/include/asm-cris/atomic.h
    +++ b/include/asm-cris/atomic.h
    @@ -7,14 +7,13 @@

    #include
    #include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    * resource counting etc..
    */

    -typedef struct { volatile int counter; } atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    --- /dev/null
    +++ b/include/asm-cris/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ASM_CRIS_ATOMIC_TYPES__
    +#define __ASM_CRIS_ATOMIC_TYPES__
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    --- a/include/asm-frv/atomic.h
    +++ b/include/asm-frv/atomic.h
    @@ -17,6 +17,7 @@
    #include
    #include
    #include
    +#include

    #ifdef CONFIG_SMP
    #error not SMP safe
    @@ -35,10 +36,6 @@
    #define smp_mb__before_atomic_inc() barrier()
    #define smp_mb__after_atomic_inc() barrier()

    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }
    #define atomic_read(v) ((v)->counter)
    #define atomic_set(v, i) (((v)->counter) = (i))
    --- /dev/null
    +++ b/include/asm-frv/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef _ASM_ATOMIC_TYPES_H
    +#define _ASM_ATOMIC_TYPES_H
    +
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/h8300/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ARCH_H8300_ATOMIC_TYPES__
    +#define __ARCH_H8300_ATOMIC_TYPES__
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/ia64/include/asm/atomic_types.h
    @@ -0,0 +1,11 @@
    +#ifndef _ASM_IA64_ATOMIC_TYPES_H
    +#define _ASM_IA64_ATOMIC_TYPES_H
    +
    +/*
    + * On IA-64, counter must always be volatile to ensure that that the
    + * memory accesses are ordered.
    + */
    +typedef struct { volatile __s32 counter; } atomic_t;
    +typedef struct { volatile __s64 counter; } atomic64_t;
    +
    +#endif
    --- a/include/asm-m32r/atomic.h
    +++ b/include/asm-m32r/atomic.h
    @@ -11,19 +11,13 @@

    #include
    #include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct { volatile int counter; } atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    /**
    --- /dev/null
    +++ b/include/asm-m32r/atomic_types.h
    @@ -0,0 +1,11 @@
    +#ifndef _ASM_M32R_ATOMIC_TYPES_H
    +#define _ASM_M32R_ATOMIC_TYPES_H
    +
    +/*
    + * Make sure gcc doesn't try to be clever and move things around
    + * on us. We need to use _exactly_ the address the user gave us,
    + * not some alias that contains the same information.
    + */
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    --- a/include/asm-m68k/atomic.h
    +++ b/include/asm-m68k/atomic.h
    @@ -3,6 +3,7 @@


    #include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    @@ -13,7 +14,6 @@
    * We do not have SMP m68k systems, so we don't have to deal with that.
    */

    -typedef struct { int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    --- /dev/null
    +++ b/include/asm-m68k/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ARCH_M68K_ATOMIC_TYPES__
    +#define __ARCH_M68K_ATOMIC_TYPES__
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/m68knommu/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ARCH_M68KNOMMU_ATOMIC_TYPES__
    +#define __ARCH_M68KNOMMU_ATOMIC_TYPES__
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/mips/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef _ASM_ATOMIC_TYPES_H
    +#define _ASM_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    --- a/include/asm-mn10300/atomic.h
    +++ b/include/asm-mn10300/atomic.h
    @@ -11,6 +11,8 @@
    #ifndef _ASM_ATOMIC_H
    #define _ASM_ATOMIC_H

    +#include
    +
    #ifdef CONFIG_SMP
    #error not SMP safe
    #endif
    @@ -20,15 +22,6 @@
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    #ifdef __KERNEL__
    --- /dev/null
    +++ b/include/asm-mn10300/atomic_types.h
    @@ -0,0 +1,13 @@
    +#ifndef _ASM_ATOMIC_TYPES_H
    +#define _ASM_ATOMIC_TYPES_H
    +
    +/*
    + * Make sure gcc doesn't try to be clever and move things around
    + * on us. We need to use _exactly_ the address the user gave us,
    + * not some alias that contains the same information.
    + */
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/powerpc/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef _ASM_POWERPC_ATOMIC_TYPES_H_
    +#define _ASM_POWERPC_ATOMIC_TYPES_H_
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/arch/s390/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef __ARCH_S390_ATOMIC_TYPES__
    +#define __ARCH_S390_ATOMIC_TYPES__
    +
    +typedef struct {
    + int counter;
    +} __attribute__ ((aligned (4))) atomic_t;
    +
    +#endif
    --- /dev/null
    +++ b/include/asm-um/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __UM_ATOMIC_TYPES_H
    +#define __UM_ATOMIC_TYPES_H
    +
    +#include "asm/arch/atomic_types.h"
    +
    +#endif
    --- a/include/asm-x86/atomic_32.h
    +++ b/include/asm-x86/atomic_32.h
    @@ -4,21 +4,13 @@
    #include
    #include
    #include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    /**
    --- a/include/asm-x86/atomic_64.h
    +++ b/include/asm-x86/atomic_64.h
    @@ -3,6 +3,7 @@

    #include
    #include
    +#include

    /* atomic_t should be 32 bit signed type */

    @@ -11,15 +12,6 @@
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    /**
    --- /dev/null
    +++ b/include/asm-x86/atomic_types.h
    @@ -0,0 +1,13 @@
    +#ifndef __ARCH_X86_ATOMIC_TYPES__
    +#define __ARCH_X86_ATOMIC_TYPES__
    +
    +/*
    + * Make sure gcc doesn't try to be clever and move things around
    + * on us. We need to use _exactly_ the address the user gave us,
    + * not some alias that contains the same information.
    + */
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    --- a/include/asm-xtensa/atomic.h
    +++ b/include/asm-xtensa/atomic.h
    @@ -14,8 +14,7 @@
    #define _XTENSA_ATOMIC_H

    #include
    -
    -typedef struct { volatile int counter; } atomic_t;
    +#include

    #ifdef __KERNEL__
    #include
    --- /dev/null
    +++ b/include/asm-xtensa/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef _XTENSA_ATOMIC_TYPES_H
    +#define _XTENSA_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    --- a/arch/sparc/include/asm/atomic_32.h
    +++ b/arch/sparc/include/asm/atomic_32.h
    @@ -13,10 +13,10 @@

    #include

    -typedef struct { volatile int counter; } atomic_t;
    -
    #ifdef __KERNEL__

    +#include
    +
    #define ATOMIC_INIT(i) { (i) }

    extern int __atomic_add_return(int, atomic_t *);
    --- a/arch/sparc/include/asm/atomic_64.h
    +++ b/arch/sparc/include/asm/atomic_64.h
    @@ -9,8 +9,8 @@

    #include
    #include
    +#include

    -typedef struct { volatile int counter; } atomic_t;
    typedef struct { volatile __s64 counter; } atomic64_t;

    #define ATOMIC_INIT(i) { (i) }
    --- /dev/null
    +++ b/arch/sparc/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef _ATOMIC_TYPES_H
    +#define _ATOMIC_TYPES_H
    +
    +typedef struct {
    + volatile int counter;
    +} atomic_t;
    +
    +#endif
    --- a/arch/sh/include/asm/atomic.h
    +++ b/arch/sh/include/asm/atomic.h
    @@ -7,7 +7,7 @@
    *
    */

    -typedef struct { volatile int counter; } atomic_t;
    +#include

    #define ATOMIC_INIT(i) ( (atomic_t) { (i) } )

    --- /dev/null
    +++ b/arch/sh/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef _ASM_IA64_ATOMIC_TYPES_H
    +#define _ASM_IA64_ATOMIC_TYPES_H
    +
    +typedef struct {
    + volatile int counter;
    +} atomic_t;
    +
    +#endif


    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.9 (GNU/Linux)

    iEYEABECAAYFAkjsgPYACgkQKhFGF+eHlpgjIACgirDaT5lYjX XRy9Kt7+vukM8+
    fYwAn29e8vvlnNjiHyhhzAFNqb4kG1k2
    =bdZT
    -----END PGP SIGNATURE-----


  2. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    On Wed, 08 Oct 2008 17:44:30 +0800
    Huang Ying wrote:

    > From: Huang Ying
    >
    > asm/atomic.h contains both declaration and implementation of atomic_t. So
    > there are some implementation related files included in asm/atomic.h. And
    > atomic_t is a typedef. Combination of above makes it impossible to use
    > atomic_t in files included by atomic.h. Such as atomic_t can not be used
    > in linux/kernel.h on i386, because it is included by asm/atomic.h.
    >
    > It is reasonable to separate declaration from implementation. So a new
    > file atomic_types.h is added for every architecture to accommodate the
    > declaration of atomic_t.
    >
    > Includes fixes from Andrew Moton.
    >
    > Signed-off-by: Huang Ying
    > Reviewed-by: Ingo Molnar


    The difference between what-i-currently-have and what-you-just-sent is
    below. It's quite large.

    Can you explain this update please?


    arch/alpha/include/asm/atomic.h | 2 +-
    arch/alpha/include/asm/atomic_types.h | 13 +++++++++++++
    arch/arm/include/asm/atomic.h | 2 +-
    arch/arm/include/asm/atomic_types.h | 6 ++++++
    arch/avr32/include/asm/atomic.h | 2 +-
    arch/avr32/include/asm/atomic_types.h | 6 ++++++
    arch/blackfin/include/asm/atomic.h | 2 +-
    arch/blackfin/include/asm/atomic_types.h | 8 ++++++++
    arch/h8300/include/asm/atomic.h | 2 +-
    arch/h8300/include/asm/atomic_types.h | 6 ++++++
    arch/ia64/include/asm/atomic.h | 2 +-
    arch/ia64/include/asm/atomic_types.h | 11 +++++++++++
    arch/m68knommu/include/asm/atomic.h | 2 +-
    arch/m68knommu/include/asm/atomic_types.h | 6 ++++++
    arch/mips/include/asm/atomic.h | 2 +-
    arch/mips/include/asm/atomic_types.h | 6 ++++++
    arch/powerpc/include/asm/atomic.h | 2 +-
    arch/powerpc/include/asm/atomic_types.h | 6 ++++++
    arch/s390/include/asm/atomic.h | 2 +-
    arch/s390/include/asm/atomic_types.h | 8 ++++++++
    arch/sh/include/asm/atomic.h | 2 +-
    arch/sh/include/asm/atomic_def.h | 8 --------
    arch/sh/include/asm/atomic_types.h | 8 ++++++++
    arch/sparc/include/asm/atomic_32.h | 2 +-
    arch/sparc/include/asm/atomic_64.h | 2 +-
    arch/sparc/include/asm/atomic_def.h | 8 --------
    arch/sparc/include/asm/atomic_types.h | 8 ++++++++
    include/asm-alpha/atomic_def.h | 13 -------------
    include/asm-arm/atomic_def.h | 6 ------
    include/asm-avr32/atomic_def.h | 6 ------
    include/asm-blackfin/atomic_def.h | 8 --------
    include/asm-cris/atomic.h | 2 +-
    include/asm-cris/atomic_def.h | 6 ------
    include/asm-cris/atomic_types.h | 6 ++++++
    include/asm-frv/atomic.h | 2 +-
    include/asm-frv/atomic_def.h | 8 --------
    include/asm-frv/atomic_types.h | 8 ++++++++
    include/asm-h8300/atomic_def.h | 6 ------
    include/asm-ia64/atomic_def.h | 11 -----------
    include/asm-m32r/atomic.h | 2 +-
    include/asm-m32r/atomic_def.h | 11 -----------
    include/asm-m32r/atomic_types.h | 11 +++++++++++
    include/asm-m68k/atomic.h | 2 +-
    include/asm-m68k/atomic_def.h | 6 ------
    include/asm-m68k/atomic_types.h | 6 ++++++
    include/asm-m68knommu/atomic_def.h | 6 ------
    include/asm-mips/atomic.h | 6 ------
    include/asm-mn10300/atomic.h | 2 +-
    include/asm-mn10300/atomic_def.h | 13 -------------
    include/asm-mn10300/atomic_types.h | 13 +++++++++++++
    include/asm-powerpc/atomic_def.h | 6 ------
    include/asm-s390/atomic_def.h | 8 --------
    include/asm-um/atomic_def.h | 6 ------
    include/asm-um/atomic_types.h | 6 ++++++
    include/asm-x86/atomic_32.h | 2 +-
    include/asm-x86/atomic_64.h | 2 +-
    include/asm-x86/atomic_def.h | 13 -------------
    include/asm-x86/atomic_types.h | 13 +++++++++++++
    include/asm-xtensa/atomic.h | 2 +-
    include/asm-xtensa/atomic_def.h | 6 ------
    include/asm-xtensa/atomic_types.h | 6 ++++++
    61 files changed, 182 insertions(+), 182 deletions(-)

    diff -puN arch/alpha/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/alpha/include/asm/atomic.h
    --- a/arch/alpha/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/alpha/include/asm/atomic.h
    @@ -3,7 +3,7 @@

    #include
    #include
    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN /dev/null arch/alpha/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/alpha/include/asm/atomic_types.h
    @@ -0,0 +1,13 @@
    +#ifndef _ALPHA_ATOMIC_TYPES_H
    +#define _ALPHA_ATOMIC_TYPES_H
    +
    +
    +/*
    + * Counter is volatile to make sure gcc doesn't try to be clever
    + * and move things around on us. We need to use _exactly_ the address
    + * the user gave us, not some alias that contains the same information.
    + */
    +typedef struct { volatile int counter; } atomic_t;
    +typedef struct { volatile long counter; } atomic64_t;
    +
    +#endif
    diff -puN arch/arm/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/arm/include/asm/atomic.h
    --- a/arch/arm/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/arm/include/asm/atomic.h
    @@ -13,7 +13,7 @@

    #include
    #include
    -#include
    +#include

    #define ATOMIC_INIT(i) { (i) }

    diff -puN /dev/null arch/arm/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/arm/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ASM_ARM_ATOMIC_TYPES_H
    +#define __ASM_ARM_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    diff -puN arch/avr32/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/avr32/include/asm/atomic.h
    --- a/arch/avr32/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/avr32/include/asm/atomic.h
    @@ -15,7 +15,7 @@
    #define __ASM_AVR32_ATOMIC_H

    #include
    -#include
    +#include

    #define ATOMIC_INIT(i) { (i) }

    diff -puN /dev/null arch/avr32/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/avr32/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ASM_AVR32_ATOMIC_TYPES_H
    +#define __ASM_AVR32_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    diff -puN arch/blackfin/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/blackfin/include/asm/atomic.h
    --- a/arch/blackfin/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/blackfin/include/asm/atomic.h
    @@ -2,7 +2,7 @@
    #define __ARCH_BLACKFIN_ATOMIC__

    #include /* local_irq_XXX() */
    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN /dev/null arch/blackfin/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/blackfin/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef __ARCH_BLACKFIN_ATOMIC_TYPES__
    +#define __ARCH_BLACKFIN_ATOMIC_TYPES__
    +
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    diff -puN arch/h8300/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/h8300/include/asm/atomic.h
    --- a/arch/h8300/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/h8300/include/asm/atomic.h
    @@ -1,7 +1,7 @@
    #ifndef __ARCH_H8300_ATOMIC__
    #define __ARCH_H8300_ATOMIC__

    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN /dev/null arch/h8300/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/h8300/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ARCH_H8300_ATOMIC_TYPES__
    +#define __ARCH_H8300_ATOMIC_TYPES__
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    diff -puN arch/ia64/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/ia64/include/asm/atomic.h
    --- a/arch/ia64/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/ia64/include/asm/atomic.h
    @@ -16,7 +16,7 @@

    #include
    #include
    -#include
    +#include

    #define ATOMIC_INIT(i) ((atomic_t) { (i) })
    #define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
    diff -puN /dev/null arch/ia64/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/ia64/include/asm/atomic_types.h
    @@ -0,0 +1,11 @@
    +#ifndef _ASM_IA64_ATOMIC_TYPES_H
    +#define _ASM_IA64_ATOMIC_TYPES_H
    +
    +/*
    + * On IA-64, counter must always be volatile to ensure that that the
    + * memory accesses are ordered.
    + */
    +typedef struct { volatile __s32 counter; } atomic_t;
    +typedef struct { volatile __s64 counter; } atomic64_t;
    +
    +#endif
    diff -puN arch/m68knommu/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/m68knommu/include/asm/atomic.h
    --- a/arch/m68knommu/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/m68knommu/include/asm/atomic.h
    @@ -2,7 +2,7 @@
    #define __ARCH_M68KNOMMU_ATOMIC__

    #include
    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN /dev/null arch/m68knommu/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/m68knommu/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ARCH_M68KNOMMU_ATOMIC_TYPES__
    +#define __ARCH_M68KNOMMU_ATOMIC_TYPES__
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    diff -puN arch/mips/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/mips/include/asm/atomic.h
    --- a/arch/mips/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/mips/include/asm/atomic.h
    @@ -19,7 +19,7 @@
    #include
    #include
    #include
    -#include
    +#include

    #define ATOMIC_INIT(i) { (i) }

    diff -puN /dev/null arch/mips/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/mips/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef _ASM_ATOMIC_TYPES_H
    +#define _ASM_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    diff -puN arch/powerpc/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/powerpc/include/asm/atomic.h
    --- a/arch/powerpc/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/powerpc/include/asm/atomic.h
    @@ -5,7 +5,7 @@
    * PowerPC atomic operations
    */

    -#include
    +#include

    #ifdef __KERNEL__
    #include
    diff -puN /dev/null arch/powerpc/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/powerpc/include/asm/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef _ASM_POWERPC_ATOMIC_TYPES_H_
    +#define _ASM_POWERPC_ATOMIC_TYPES_H_
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    diff -puN arch/s390/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/s390/include/asm/atomic.h
    --- a/arch/s390/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/s390/include/asm/atomic.h
    @@ -2,7 +2,7 @@
    #define __ARCH_S390_ATOMIC__

    #include
    -#include
    +#include

    /*
    * include/asm-s390/atomic.h
    diff -puN /dev/null arch/s390/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/s390/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef __ARCH_S390_ATOMIC_TYPES__
    +#define __ARCH_S390_ATOMIC_TYPES__
    +
    +typedef struct {
    + int counter;
    +} __attribute__ ((aligned (4))) atomic_t;
    +
    +#endif
    diff -puN arch/sh/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/sh/include/asm/atomic.h
    --- a/arch/sh/include/asm/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/sh/include/asm/atomic.h
    @@ -7,7 +7,7 @@
    *
    */

    -#include
    +#include

    #define ATOMIC_INIT(i) ( (atomic_t) { (i) } )

    diff -puN arch/sh/include/asm/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/arch/sh/include/asm/atomic_def.h
    +++ /dev/null
    @@ -1,8 +0,0 @@
    -#ifndef _ASM_IA64_ATOMIC_DEF_H
    -#define _ASM_IA64_ATOMIC_DEF_H
    -
    -typedef struct {
    - volatile int counter;
    -} atomic_t;
    -
    -#endif
    diff -puN /dev/null arch/sh/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/sh/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef _ASM_IA64_ATOMIC_TYPES_H
    +#define _ASM_IA64_ATOMIC_TYPES_H
    +
    +typedef struct {
    + volatile int counter;
    +} atomic_t;
    +
    +#endif
    diff -puN arch/sparc/include/asm/atomic_32.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/sparc/include/asm/atomic_32.h
    --- a/arch/sparc/include/asm/atomic_32.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/sparc/include/asm/atomic_32.h
    @@ -15,7 +15,7 @@

    #ifdef __KERNEL__

    -#include
    +#include

    #define ATOMIC_INIT(i) { (i) }

    diff -puN arch/sparc/include/asm/atomic_64.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update arch/sparc/include/asm/atomic_64.h
    --- a/arch/sparc/include/asm/atomic_64.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/arch/sparc/include/asm/atomic_64.h
    @@ -9,7 +9,7 @@

    #include
    #include
    -#include
    +#include

    typedef struct { volatile __s64 counter; } atomic64_t;

    diff -puN arch/sparc/include/asm/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/arch/sparc/include/asm/atomic_def.h
    +++ /dev/null
    @@ -1,8 +0,0 @@
    -#ifndef _ATOMIC_DEF_H
    -#define _ATOMIC_DEF_H
    -
    -typedef struct {
    - volatile int counter;
    -} atomic_t;
    -
    -#endif
    diff -puN /dev/null arch/sparc/include/asm/atomic_types.h
    --- /dev/null
    +++ a/arch/sparc/include/asm/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef _ATOMIC_TYPES_H
    +#define _ATOMIC_TYPES_H
    +
    +typedef struct {
    + volatile int counter;
    +} atomic_t;
    +
    +#endif
    diff -puN include/asm-alpha/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-alpha/atomic_def.h
    +++ /dev/null
    @@ -1,13 +0,0 @@
    -#ifndef _ALPHA_ATOMIC_DEF_H
    -#define _ALPHA_ATOMIC_DEF_H
    -
    -
    -/*
    - * Counter is volatile to make sure gcc doesn't try to be clever
    - * and move things around on us. We need to use _exactly_ the address
    - * the user gave us, not some alias that contains the same information.
    - */
    -typedef struct { volatile int counter; } atomic_t;
    -typedef struct { volatile long counter; } atomic64_t;
    -
    -#endif
    diff -puN include/asm-arm/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-arm/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef __ASM_ARM_ATOMIC_DEF_H
    -#define __ASM_ARM_ATOMIC_DEF_H
    -
    -typedef struct { volatile int counter; } atomic_t;
    -
    -#endif
    diff -puN include/asm-avr32/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-avr32/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef __ASM_AVR32_ATOMIC_DEF_H
    -#define __ASM_AVR32_ATOMIC_DEF_H
    -
    -typedef struct { volatile int counter; } atomic_t;
    -
    -#endif
    diff -puN include/asm-blackfin/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-blackfin/atomic_def.h
    +++ /dev/null
    @@ -1,8 +0,0 @@
    -#ifndef __ARCH_BLACKFIN_ATOMIC_DEF__
    -#define __ARCH_BLACKFIN_ATOMIC_DEF__
    -
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    -#endif
    diff -puN include/asm-cris/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-cris/atomic.h
    --- a/include/asm-cris/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-cris/atomic.h
    @@ -7,7 +7,7 @@

    #include
    #include
    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN include/asm-cris/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-cris/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef __ASM_CRIS_ATOMIC_DEF__
    -#define __ASM_CRIS_ATOMIC_DEF__
    -
    -typedef struct { volatile int counter; } atomic_t;
    -
    -#endif
    diff -puN /dev/null include/asm-cris/atomic_types.h
    --- /dev/null
    +++ a/include/asm-cris/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ASM_CRIS_ATOMIC_TYPES__
    +#define __ASM_CRIS_ATOMIC_TYPES__
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    diff -puN include/asm-frv/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-frv/atomic.h
    --- a/include/asm-frv/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-frv/atomic.h
    @@ -17,7 +17,7 @@
    #include
    #include
    #include
    -#include
    +#include

    #ifdef CONFIG_SMP
    #error not SMP safe
    diff -puN include/asm-frv/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-frv/atomic_def.h
    +++ /dev/null
    @@ -1,8 +0,0 @@
    -#ifndef _ASM_ATOMIC_DEF_H
    -#define _ASM_ATOMIC_DEF_H
    -
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    -#endif
    diff -puN /dev/null include/asm-frv/atomic_types.h
    --- /dev/null
    +++ a/include/asm-frv/atomic_types.h
    @@ -0,0 +1,8 @@
    +#ifndef _ASM_ATOMIC_TYPES_H
    +#define _ASM_ATOMIC_TYPES_H
    +
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    diff -puN include/asm-h8300/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-h8300/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef __ARCH_H8300_ATOMIC_DEF__
    -#define __ARCH_H8300_ATOMIC_DEF__
    -
    -typedef struct { int counter; } atomic_t;
    -
    -#endif
    diff -puN include/asm-ia64/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-ia64/atomic_def.h
    +++ /dev/null
    @@ -1,11 +0,0 @@
    -#ifndef _ASM_IA64_ATOMIC_DEF_H
    -#define _ASM_IA64_ATOMIC_DEF_H
    -
    -/*
    - * On IA-64, counter must always be volatile to ensure that that the
    - * memory accesses are ordered.
    - */
    -typedef struct { volatile __s32 counter; } atomic_t;
    -typedef struct { volatile __s64 counter; } atomic64_t;
    -
    -#endif
    diff -puN include/asm-m32r/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-m32r/atomic.h
    --- a/include/asm-m32r/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-m32r/atomic.h
    @@ -11,7 +11,7 @@

    #include
    #include
    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN include/asm-m32r/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-m32r/atomic_def.h
    +++ /dev/null
    @@ -1,11 +0,0 @@
    -#ifndef _ASM_M32R_ATOMIC_DEF_H
    -#define _ASM_M32R_ATOMIC_DEF_H
    -
    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct { volatile int counter; } atomic_t;
    -
    -#endif
    diff -puN /dev/null include/asm-m32r/atomic_types.h
    --- /dev/null
    +++ a/include/asm-m32r/atomic_types.h
    @@ -0,0 +1,11 @@
    +#ifndef _ASM_M32R_ATOMIC_TYPES_H
    +#define _ASM_M32R_ATOMIC_TYPES_H
    +
    +/*
    + * Make sure gcc doesn't try to be clever and move things around
    + * on us. We need to use _exactly_ the address the user gave us,
    + * not some alias that contains the same information.
    + */
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    diff -puN include/asm-m68k/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-m68k/atomic.h
    --- a/include/asm-m68k/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-m68k/atomic.h
    @@ -3,7 +3,7 @@


    #include
    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN include/asm-m68k/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-m68k/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef __ARCH_M68K_ATOMIC_DEF__
    -#define __ARCH_M68K_ATOMIC_DEF__
    -
    -typedef struct { int counter; } atomic_t;
    -
    -#endif
    diff -puN /dev/null include/asm-m68k/atomic_types.h
    --- /dev/null
    +++ a/include/asm-m68k/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __ARCH_M68K_ATOMIC_TYPES__
    +#define __ARCH_M68K_ATOMIC_TYPES__
    +
    +typedef struct { int counter; } atomic_t;
    +
    +#endif
    diff -puN include/asm-m68knommu/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-m68knommu/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef __ARCH_M68KNOMMU_ATOMIC_DEF__
    -#define __ARCH_M68KNOMMU_ATOMIC_DEF__
    -
    -typedef struct { int counter; } atomic_t;
    -
    -#endif
    diff -puN include/asm-mips/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-mips/atomic.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef _ASM_ATOMIC_DEF_H
    -#define _ASM_ATOMIC_DEF_H
    -
    -typedef struct { volatile int counter; } atomic_t;
    -
    -#endif
    diff -puN include/asm-mn10300/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-mn10300/atomic.h
    --- a/include/asm-mn10300/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-mn10300/atomic.h
    @@ -11,7 +11,7 @@
    #ifndef _ASM_ATOMIC_H
    #define _ASM_ATOMIC_H

    -#include
    +#include

    #ifdef CONFIG_SMP
    #error not SMP safe
    diff -puN include/asm-mn10300/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-mn10300/atomic_def.h
    +++ /dev/null
    @@ -1,13 +0,0 @@
    -#ifndef _ASM_ATOMIC_DEF_H
    -#define _ASM_ATOMIC_DEF_H
    -
    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    -#endif
    diff -puN /dev/null include/asm-mn10300/atomic_types.h
    --- /dev/null
    +++ a/include/asm-mn10300/atomic_types.h
    @@ -0,0 +1,13 @@
    +#ifndef _ASM_ATOMIC_TYPES_H
    +#define _ASM_ATOMIC_TYPES_H
    +
    +/*
    + * Make sure gcc doesn't try to be clever and move things around
    + * on us. We need to use _exactly_ the address the user gave us,
    + * not some alias that contains the same information.
    + */
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    diff -puN include/asm-powerpc/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-powerpc/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef _ASM_POWERPC_ATOMIC_DEF_H_
    -#define _ASM_POWERPC_ATOMIC_DEF_H_
    -
    -typedef struct { int counter; } atomic_t;
    -
    -#endif
    diff -puN include/asm-s390/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-s390/atomic_def.h
    +++ /dev/null
    @@ -1,8 +0,0 @@
    -#ifndef __ARCH_S390_ATOMIC_DEF__
    -#define __ARCH_S390_ATOMIC_DEF__
    -
    -typedef struct {
    - int counter;
    -} __attribute__ ((aligned (4))) atomic_t;
    -
    -#endif
    diff -puN include/asm-um/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-um/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef __UM_ATOMIC_DEF_H
    -#define __UM_ATOMIC_DEF_H
    -
    -#include "asm/arch/atomic_def.h"
    -
    -#endif
    diff -puN /dev/null include/asm-um/atomic_types.h
    --- /dev/null
    +++ a/include/asm-um/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef __UM_ATOMIC_TYPES_H
    +#define __UM_ATOMIC_TYPES_H
    +
    +#include "asm/arch/atomic_types.h"
    +
    +#endif
    diff -puN include/asm-x86/atomic_32.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-x86/atomic_32.h
    --- a/include/asm-x86/atomic_32.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-x86/atomic_32.h
    @@ -4,7 +4,7 @@
    #include
    #include
    #include
    -#include
    +#include

    /*
    * Atomic operations that C can't guarantee us. Useful for
    diff -puN include/asm-x86/atomic_64.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-x86/atomic_64.h
    --- a/include/asm-x86/atomic_64.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-x86/atomic_64.h
    @@ -3,7 +3,7 @@

    #include
    #include
    -#include
    +#include

    /* atomic_t should be 32 bit signed type */

    diff -puN include/asm-x86/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-x86/atomic_def.h
    +++ /dev/null
    @@ -1,13 +0,0 @@
    -#ifndef __ARCH_X86_ATOMIC_DEF__
    -#define __ARCH_X86_ATOMIC_DEF__
    -
    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    -#endif
    diff -puN /dev/null include/asm-x86/atomic_types.h
    --- /dev/null
    +++ a/include/asm-x86/atomic_types.h
    @@ -0,0 +1,13 @@
    +#ifndef __ARCH_X86_ATOMIC_TYPES__
    +#define __ARCH_X86_ATOMIC_TYPES__
    +
    +/*
    + * Make sure gcc doesn't try to be clever and move things around
    + * on us. We need to use _exactly_ the address the user gave us,
    + * not some alias that contains the same information.
    + */
    +typedef struct {
    + int counter;
    +} atomic_t;
    +
    +#endif
    diff -puN include/asm-xtensa/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update include/asm-xtensa/atomic.h
    --- a/include/asm-xtensa/atomic.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update
    +++ a/include/asm-xtensa/atomic.h
    @@ -14,7 +14,7 @@
    #define _XTENSA_ATOMIC_H

    #include
    -#include
    +#include

    #ifdef __KERNEL__
    #include
    diff -puN include/asm-xtensa/atomic_def.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-update /dev/null
    --- a/include/asm-xtensa/atomic_def.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef _XTENSA_ATOMIC_DEF_H
    -#define _XTENSA_ATOMIC_DEF_H
    -
    -typedef struct { volatile int counter; } atomic_t;
    -
    -#endif
    diff -puN /dev/null include/asm-xtensa/atomic_types.h
    --- /dev/null
    +++ a/include/asm-xtensa/atomic_types.h
    @@ -0,0 +1,6 @@
    +#ifndef _XTENSA_ATOMIC_TYPES_H
    +#define _XTENSA_ATOMIC_TYPES_H
    +
    +typedef struct { volatile int counter; } atomic_t;
    +
    +#endif
    _

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h


    * Andrew Morton wrote:

    > On Wed, 08 Oct 2008 17:44:30 +0800
    > Huang Ying wrote:
    >
    > > From: Huang Ying
    > >
    > > asm/atomic.h contains both declaration and implementation of atomic_t. So
    > > there are some implementation related files included in asm/atomic.h. And
    > > atomic_t is a typedef. Combination of above makes it impossible to use
    > > atomic_t in files included by atomic.h. Such as atomic_t can not be used
    > > in linux/kernel.h on i386, because it is included by asm/atomic.h.
    > >
    > > It is reasonable to separate declaration from implementation. So a new
    > > file atomic_types.h is added for every architecture to accommodate the
    > > declaration of atomic_t.
    > >
    > > Includes fixes from Andrew Moton.
    > >
    > > Signed-off-by: Huang Ying
    > > Reviewed-by: Ingo Molnar

    >
    > The difference between what-i-currently-have and what-you-just-sent is
    > below. It's quite large.
    >
    > Can you explain this update please?


    i've been giving review feedback to make it all fit into existing
    namespace concepts better. Should have no change in functionality. (But
    i have not tested it)

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  4. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    On Fri, 10 Oct 2008 23:49:58 +0200
    Ingo Molnar wrote:

    >
    > * Andrew Morton wrote:
    >
    > > On Wed, 08 Oct 2008 17:44:30 +0800
    > > Huang Ying wrote:
    > >
    > > > From: Huang Ying
    > > >
    > > > asm/atomic.h contains both declaration and implementation of atomic_t. So
    > > > there are some implementation related files included in asm/atomic.h. And
    > > > atomic_t is a typedef. Combination of above makes it impossible to use
    > > > atomic_t in files included by atomic.h. Such as atomic_t can not be used
    > > > in linux/kernel.h on i386, because it is included by asm/atomic.h.
    > > >
    > > > It is reasonable to separate declaration from implementation. So a new
    > > > file atomic_types.h is added for every architecture to accommodate the
    > > > declaration of atomic_t.
    > > >
    > > > Includes fixes from Andrew Moton.
    > > >
    > > > Signed-off-by: Huang Ying
    > > > Reviewed-by: Ingo Molnar

    > >
    > > The difference between what-i-currently-have and what-you-just-sent is
    > > below. It's quite large.
    > >
    > > Can you explain this update please?

    >
    > i've been giving review feedback to make it all fit into existing
    > namespace concepts better. Should have no change in functionality. (But
    > i have not tested it)
    >


    I have a note here that Matthew has proposed a different way of doing
    all this. I don't immediately recall the details.

    Can we get a refresh on all of that please?
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  5. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    On Fri, Oct 10, 2008 at 03:54:50PM -0700, Andrew Morton wrote:
    > I have a note here that Matthew has proposed a different way of doing
    > all this. I don't immediately recall the details.
    >
    > Can we get a refresh on all of that please?


    I didn't remember either, but having just reviewed my inbox from August,
    I said that all architectures basically use:

    typedef struct { volatile int counter; } atomic_t;
    #ifdef CONFIG_64BIT
    typedef struct { volatile long counter; } atomic64_t;
    #endif

    and that should just be put in .

    Roman Zippel did me one better and suggested just putting it in types.h,
    which works for me.

    --
    Matthew Wilcox Intel Open Source Technology Centre
    "Bill, look, we understand that you're interested in selling us this
    operating system, but compare it to ours. We can't possibly take such
    a retrograde step."
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  6. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    On Tue, 14 Oct 2008 12:47:19 -0600
    Matthew Wilcox wrote:

    > On Fri, Oct 10, 2008 at 03:54:50PM -0700, Andrew Morton wrote:
    > > I have a note here that Matthew has proposed a different way of doing
    > > all this. I don't immediately recall the details.
    > >
    > > Can we get a refresh on all of that please?

    >
    > I didn't remember either, but having just reviewed my inbox from August,
    > I said that all architectures basically use:
    >
    > typedef struct { volatile int counter; } atomic_t;
    > #ifdef CONFIG_64BIT
    > typedef struct { volatile long counter; } atomic64_t;
    > #endif
    >
    > and that should just be put in .
    >
    > Roman Zippel did me one better and suggested just putting it in types.h,
    > which works for me.


    OK. Or we could do the usual include/asm-generic/atomic_types.h and
    then architectures can choose to include that if it is appropriate.

    Anyway the good news is that this concept is an addition to rather than
    a replacement of this current patch.

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  7. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    On Wed, Oct 15, 2008 at 03:11:19PM -0700, Andrew Morton wrote:
    > On Tue, 14 Oct 2008 12:47:19 -0600
    > Matthew Wilcox wrote:
    > > Roman Zippel did me one better and suggested just putting it in types.h,
    > > which works for me.

    >
    > OK. Or we could do the usual include/asm-generic/atomic_types.h and
    > then architectures can choose to include that if it is appropriate.
    >
    > Anyway the good news is that this concept is an addition to rather than
    > a replacement of this current patch.


    Um, no. Roman and I are against the creation of a new file. Just put
    the atomic_t definition in .

    --
    Matthew Wilcox Intel Open Source Technology Centre
    "Bill, look, we understand that you're interested in selling us this
    operating system, but compare it to ours. We can't possibly take such
    a retrograde step."
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  8. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    On Wed, 15 Oct 2008 16:19:48 -0600
    Matthew Wilcox wrote:

    > On Wed, Oct 15, 2008 at 03:11:19PM -0700, Andrew Morton wrote:
    > > On Tue, 14 Oct 2008 12:47:19 -0600
    > > Matthew Wilcox wrote:
    > > > Roman Zippel did me one better and suggested just putting it in types.h,
    > > > which works for me.

    > >
    > > OK. Or we could do the usual include/asm-generic/atomic_types.h and
    > > then architectures can choose to include that if it is appropriate.
    > >
    > > Anyway the good news is that this concept is an addition to rather than
    > > a replacement of this current patch.

    >
    > Um, no. Roman and I are against the creation of a new file. Just put
    > the atomic_t definition in .


    Well we've been glacially fartarsing around with this for sufficiently
    long that any such alterations will be too late for 2.6.28.

    I'll drop it all. Again.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  9. Re: [PATCH -mm -v5] Separate atomic_t declaration from asm/atomic.h into asm/atomic_def.h

    On Wed, Oct 15, 2008 at 03:31:24PM -0700, Andrew Morton wrote:
    > Well we've been glacially fartarsing around with this for sufficiently
    > long that any such alterations will be too late for 2.6.28.
    >
    > I'll drop it all. Again.


    Here's an updated patch which uses linux/types.h as suggested by Roman.
    I started fresh rather than use the original patch. I compared the
    diffstats afterwards and I caught one architecture the original didn't
    (parisc), plus the original was creating files in include/asm-*/ even
    for architectures that had migrated to arch/*/include/asm.

    ---

    The atomic_t type cannot currently be used in some header files because it
    would create an include loop with asm/atomic.h. Move the type definition
    to linux/types.h to break the loop.

    Signed-off-by: Matthew Wilcox

    arch/alpha/include/asm/atomic.h | 9 +--------
    arch/arm/include/asm/atomic.h | 3 +--
    arch/avr32/include/asm/atomic.h | 2 +-
    arch/blackfin/include/asm/atomic.h | 4 +---
    arch/h8300/include/asm/atomic.h | 3 ++-
    arch/ia64/include/asm/atomic.h | 6 ------
    arch/m68knommu/include/asm/atomic.h | 2 +-
    arch/mips/include/asm/atomic.h | 5 +----
    arch/powerpc/include/asm/atomic.h | 4 +---
    arch/s390/include/asm/atomic.h | 7 +------
    arch/sh/include/asm/atomic.h | 7 +++----
    arch/sparc/include/asm/atomic_32.h | 2 --
    arch/sparc/include/asm/atomic_64.h | 3 ---
    include/asm-cris/atomic.h | 4 +---
    include/asm-frv/atomic.h | 4 ----
    include/asm-m32r/atomic.h | 8 +-------
    include/asm-m68k/atomic.h | 3 +--
    include/asm-mn10300/atomic.h | 9 ---------
    include/asm-parisc/atomic.h | 11 +++--------
    include/asm-x86/atomic_32.h | 10 +---------
    include/asm-x86/atomic_64.h | 18 ++----------------
    include/asm-xtensa/atomic.h | 3 +--
    include/linux/types.h | 10 ++++++++++
    23 files changed, 33 insertions(+), 104 deletions(-)

    diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
    index ca88e54..62b3635 100644
    --- a/arch/alpha/include/asm/atomic.h
    +++ b/arch/alpha/include/asm/atomic.h
    @@ -1,6 +1,7 @@
    #ifndef _ALPHA_ATOMIC_H
    #define _ALPHA_ATOMIC_H

    +#include
    #include
    #include

    @@ -13,14 +14,6 @@
    */


    -/*
    - * Counter is volatile to make sure gcc doesn't try to be clever
    - * and move things around on us. We need to use _exactly_ the address
    - * the user gave us, not some alias that contains the same information.
    - */
    -typedef struct { volatile int counter; } atomic_t;
    -typedef struct { volatile long counter; } atomic64_t;
    -
    #define ATOMIC_INIT(i) ( (atomic_t) { (i) } )
    #define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )

    diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
    index 325f881..ee99723 100644
    --- a/arch/arm/include/asm/atomic.h
    +++ b/arch/arm/include/asm/atomic.h
    @@ -12,10 +12,9 @@
    #define __ASM_ARM_ATOMIC_H

    #include
    +#include
    #include

    -typedef struct { volatile int counter; } atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    #ifdef __KERNEL__
    diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h
    index 7ef3862..3188151 100644
    --- a/arch/avr32/include/asm/atomic.h
    +++ b/arch/avr32/include/asm/atomic.h
    @@ -14,9 +14,9 @@
    #ifndef __ASM_AVR32_ATOMIC_H
    #define __ASM_AVR32_ATOMIC_H

    +#include
    #include

    -typedef struct { volatile int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h
    index 7cf5087..25776c1 100644
    --- a/arch/blackfin/include/asm/atomic.h
    +++ b/arch/blackfin/include/asm/atomic.h
    @@ -1,6 +1,7 @@
    #ifndef __ARCH_BLACKFIN_ATOMIC__
    #define __ARCH_BLACKFIN_ATOMIC__

    +#include
    #include /* local_irq_XXX() */

    /*
    @@ -13,9 +14,6 @@
    * Tony Kou (tonyko@lineo.ca) Lineo Inc. 2001
    */

    -typedef struct {
    - int counter;
    -} atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h
    index b4cf0ea..833186c 100644
    --- a/arch/h8300/include/asm/atomic.h
    +++ b/arch/h8300/include/asm/atomic.h
    @@ -1,12 +1,13 @@
    #ifndef __ARCH_H8300_ATOMIC__
    #define __ARCH_H8300_ATOMIC__

    +#include
    +
    /*
    * Atomic operations that C can't guarantee us. Useful for
    * resource counting etc..
    */

    -typedef struct { int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
    index 50c2b83..d37292b 100644
    --- a/arch/ia64/include/asm/atomic.h
    +++ b/arch/ia64/include/asm/atomic.h
    @@ -17,12 +17,6 @@
    #include
    #include

    -/*
    - * On IA-64, counter must always be volatile to ensure that that the
    - * memory accesses are ordered.
    - */
    -typedef struct { volatile __s32 counter; } atomic_t;
    -typedef struct { volatile __s64 counter; } atomic64_t;

    #define ATOMIC_INIT(i) ((atomic_t) { (i) })
    #define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
    diff --git a/arch/m68knommu/include/asm/atomic.h b/arch/m68knommu/include/asm/atomic.h
    index d5632a3..6bb6748 100644
    --- a/arch/m68knommu/include/asm/atomic.h
    +++ b/arch/m68knommu/include/asm/atomic.h
    @@ -1,6 +1,7 @@
    #ifndef __ARCH_M68KNOMMU_ATOMIC__
    #define __ARCH_M68KNOMMU_ATOMIC__

    +#include
    #include

    /*
    @@ -12,7 +13,6 @@
    * We do not have SMP m68k systems, so we don't have to deal with that.
    */

    -typedef struct { int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
    index 1232be3..c996c3b 100644
    --- a/arch/mips/include/asm/atomic.h
    +++ b/arch/mips/include/asm/atomic.h
    @@ -15,13 +15,12 @@
    #define _ASM_ATOMIC_H

    #include
    +#include
    #include
    #include
    #include
    #include

    -typedef struct { volatile int counter; } atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    /*
    @@ -404,8 +403,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

    #ifdef CONFIG_64BIT

    -typedef struct { volatile long counter; } atomic64_t;
    -
    #define ATOMIC64_INIT(i) { (i) }

    /*
    diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
    index f3fc733..9c74e6d 100644
    --- a/arch/powerpc/include/asm/atomic.h
    +++ b/arch/powerpc/include/asm/atomic.h
    @@ -5,7 +5,7 @@
    * PowerPC atomic operations
    */

    -typedef struct { int counter; } atomic_t;
    +#include

    #ifdef __KERNEL__
    #include
    @@ -251,8 +251,6 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)

    #ifdef __powerpc64__

    -typedef struct { long counter; } atomic64_t;
    -
    #define ATOMIC64_INIT(i) { (i) }

    static __inline__ long atomic64_read(const atomic64_t *v)
    diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
    index 2d18465..de432f2 100644
    --- a/arch/s390/include/asm/atomic.h
    +++ b/arch/s390/include/asm/atomic.h
    @@ -2,6 +2,7 @@
    #define __ARCH_S390_ATOMIC__

    #include
    +#include

    /*
    * include/asm-s390/atomic.h
    @@ -23,9 +24,6 @@
    * S390 uses 'Compare And Swap' for atomicity in SMP enviroment
    */

    -typedef struct {
    - int counter;
    -} __attribute__ ((aligned (4))) atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #ifdef __KERNEL__
    @@ -149,9 +147,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
    #undef __CS_LOOP

    #ifdef __s390x__
    -typedef struct {
    - long long counter;
    -} __attribute__ ((aligned (8))) atomic64_t;
    #define ATOMIC64_INIT(i) { (i) }

    #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
    diff --git a/arch/sh/include/asm/atomic.h b/arch/sh/include/asm/atomic.h
    index c043ef0..6327ffb 100644
    --- a/arch/sh/include/asm/atomic.h
    +++ b/arch/sh/include/asm/atomic.h
    @@ -7,16 +7,15 @@
    *
    */

    -typedef struct { volatile int counter; } atomic_t;
    +#include
    +#include
    +#include

    #define ATOMIC_INIT(i) ( (atomic_t) { (i) } )

    #define atomic_read(v) ((v)->counter)
    #define atomic_set(v,i) ((v)->counter = (i))

    -#include
    -#include
    -
    #if defined(CONFIG_GUSA_RB)
    #include
    #elif defined(CONFIG_CPU_SH4A)
    diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
    index 5c944b5..ce46597 100644
    --- a/arch/sparc/include/asm/atomic_32.h
    +++ b/arch/sparc/include/asm/atomic_32.h
    @@ -13,8 +13,6 @@

    #include

    -typedef struct { volatile int counter; } atomic_t;
    -
    #ifdef __KERNEL__

    #define ATOMIC_INIT(i) { (i) }
    diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
    index 2c71ec4..f432a4e 100644
    --- a/arch/sparc/include/asm/atomic_64.h
    +++ b/arch/sparc/include/asm/atomic_64.h
    @@ -10,9 +10,6 @@
    #include
    #include

    -typedef struct { volatile int counter; } atomic_t;
    -typedef struct { volatile __s64 counter; } atomic64_t;
    -
    #define ATOMIC_INIT(i) { (i) }
    #define ATOMIC64_INIT(i) { (i) }

    diff --git a/include/asm-cris/atomic.h b/include/asm-cris/atomic.h
    index 5fc8776..3293a6a 100644
    --- a/include/asm-cris/atomic.h
    +++ b/include/asm-cris/atomic.h
    @@ -4,7 +4,7 @@
    #define __ASM_CRIS_ATOMIC__

    #include
    -
    +#include
    #include
    #include

    @@ -13,8 +13,6 @@
    * resource counting etc..
    */

    -typedef struct { volatile int counter; } atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h
    index 46d696b..296c35c 100644
    --- a/include/asm-frv/atomic.h
    +++ b/include/asm-frv/atomic.h
    @@ -35,10 +35,6 @@
    #define smp_mb__before_atomic_inc() barrier()
    #define smp_mb__after_atomic_inc() barrier()

    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }
    #define atomic_read(v) ((v)->counter)
    #define atomic_set(v, i) (((v)->counter) = (i))
    diff --git a/include/asm-m32r/atomic.h b/include/asm-m32r/atomic.h
    index 3a38ffe..2eed30f 100644
    --- a/include/asm-m32r/atomic.h
    +++ b/include/asm-m32r/atomic.h
    @@ -9,6 +9,7 @@
    * Copyright (C) 2004 Hirokazu Takata
    */

    +#include
    #include
    #include

    @@ -17,13 +18,6 @@
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct { volatile int counter; } atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    /**
    diff --git a/include/asm-m68k/atomic.h b/include/asm-m68k/atomic.h
    index 4915294..eb0ab9d 100644
    --- a/include/asm-m68k/atomic.h
    +++ b/include/asm-m68k/atomic.h
    @@ -1,7 +1,7 @@
    #ifndef __ARCH_M68K_ATOMIC__
    #define __ARCH_M68K_ATOMIC__

    -
    +#include
    #include

    /*
    @@ -13,7 +13,6 @@
    * We do not have SMP m68k systems, so we don't have to deal with that.
    */

    -typedef struct { int counter; } atomic_t;
    #define ATOMIC_INIT(i) { (i) }

    #define atomic_read(v) ((v)->counter)
    diff --git a/include/asm-mn10300/atomic.h b/include/asm-mn10300/atomic.h
    index 27c9690..bc06482 100644
    --- a/include/asm-mn10300/atomic.h
    +++ b/include/asm-mn10300/atomic.h
    @@ -20,15 +20,6 @@
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    #ifdef __KERNEL__
    diff --git a/include/asm-parisc/atomic.h b/include/asm-parisc/atomic.h
    index 57fcc4a..edbfe25 100644
    --- a/include/asm-parisc/atomic.h
    +++ b/include/asm-parisc/atomic.h
    @@ -155,14 +155,11 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,
    #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
    #endif

    -/* Note that we need not lock read accesses - aligned word writes/reads
    - * are atomic, so a reader never sees unconsistent values.
    - *
    - * Cache-line alignment would conflict with, for example, linux/module.h
    +/*
    + * Note that we need not lock read accesses - aligned word writes/reads
    + * are atomic, so a reader never sees inconsistent values.
    */

    -typedef struct { volatile int counter; } atomic_t;
    -
    /* It's possible to reduce all atomic operations to either
    * __atomic_add_return, atomic_set and atomic_read (the latter
    * is there only for consistency).
    @@ -260,8 +257,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

    #ifdef CONFIG_64BIT

    -typedef struct { volatile s64 counter; } atomic64_t;
    -
    #define ATOMIC64_INIT(i) ((atomic64_t) { (i) })

    static __inline__ int
    diff --git a/include/asm-x86/atomic_32.h b/include/asm-x86/atomic_32.h
    index 14d3f0b..f3b37f8 100644
    --- a/include/asm-x86/atomic_32.h
    +++ b/include/asm-x86/atomic_32.h
    @@ -2,6 +2,7 @@
    #define ASM_X86__ATOMIC_32_H

    #include
    +#include
    #include
    #include

    @@ -10,15 +11,6 @@
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    /**
    diff --git a/include/asm-x86/atomic_64.h b/include/asm-x86/atomic_64.h
    index 2cb218c..acd07a5 100644
    --- a/include/asm-x86/atomic_64.h
    +++ b/include/asm-x86/atomic_64.h
    @@ -1,25 +1,15 @@
    #ifndef ASM_X86__ATOMIC_64_H
    #define ASM_X86__ATOMIC_64_H

    +#include
    #include
    #include

    -/* atomic_t should be 32 bit signed type */
    -
    /*
    * Atomic operations that C can't guarantee us. Useful for
    * resource counting etc..
    */

    -/*
    - * Make sure gcc doesn't try to be clever and move things around
    - * on us. We need to use _exactly_ the address the user gave us,
    - * not some alias that contains the same information.
    - */
    -typedef struct {
    - int counter;
    -} atomic_t;
    -
    #define ATOMIC_INIT(i) { (i) }

    /**
    @@ -191,11 +181,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)
    #define atomic_inc_return(v) (atomic_add_return(1, v))
    #define atomic_dec_return(v) (atomic_sub_return(1, v))

    -/* An 64bit atomic type */
    -
    -typedef struct {
    - long counter;
    -} atomic64_t;
    +/* The 64-bit atomic type */

    #define ATOMIC64_INIT(i) { (i) }

    diff --git a/include/asm-xtensa/atomic.h b/include/asm-xtensa/atomic.h
    index b3b2354..67ad67b 100644
    --- a/include/asm-xtensa/atomic.h
    +++ b/include/asm-xtensa/atomic.h
    @@ -14,8 +14,7 @@
    #define _XTENSA_ATOMIC_H

    #include
    -
    -typedef struct { volatile int counter; } atomic_t;
    +#include

    #ifdef __KERNEL__
    #include
    diff --git a/include/linux/types.h b/include/linux/types.h
    index f24f7be..400df51 100644
    --- a/include/linux/types.h
    +++ b/include/linux/types.h
    @@ -199,6 +199,16 @@ typedef u32 phys_addr_t;

    typedef phys_addr_t resource_size_t;

    +typedef struct {
    + volatile int counter;
    +} atomic_t;
    +
    +#ifdef CONFIG_64BIT
    +typedef struct {
    + volatile long counter;
    +} atomic64_t;
    +#endif
    +
    struct ustat {
    __kernel_daddr_t f_tfree;
    __kernel_ino_t f_tinode;

    --
    Matthew Wilcox Intel Open Source Technology Centre
    "Bill, look, we understand that you're interested in selling us this
    operating system, but compare it to ours. We can't possibly take such
    a retrograde step."
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread