diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2009-05-13 22:56:29 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@klappe2.(none)> | 2009-06-11 21:02:17 +0200 |
| commit | 72099ed2719fc5829bd79c6ca9d1783ed026eb37 (patch) | |
| tree | d404ded029707e3ae9146431d6b9fa033f99a64e /arch/m68k | |
| parent | e64a1617eca39d62b248a11699de9c1195369661 (diff) | |
| download | kernel_samsung_aries-72099ed2719fc5829bd79c6ca9d1783ed026eb37.zip kernel_samsung_aries-72099ed2719fc5829bd79c6ca9d1783ed026eb37.tar.gz kernel_samsung_aries-72099ed2719fc5829bd79c6ca9d1783ed026eb37.tar.bz2 | |
asm-generic: rename atomic.h to atomic-long.h
The existing asm-generic/atomic.h only defines the
atomic_long type. This renames it to atomic-long.h
so we have a place to add a truly generic atomic.h
that can be used on all non-SMP systems.
Signed-off-by: Remis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/atomic_mm.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/asm/atomic_no.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/atomic_mm.h b/arch/m68k/include/asm/atomic_mm.h index eb0ab9d..88b7af2 100644 --- a/arch/m68k/include/asm/atomic_mm.h +++ b/arch/m68k/include/asm/atomic_mm.h @@ -192,5 +192,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) #define smp_mb__before_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier() -#include <asm-generic/atomic.h> +#include <asm-generic/atomic-long.h> #endif /* __ARCH_M68K_ATOMIC __ */ diff --git a/arch/m68k/include/asm/atomic_no.h b/arch/m68k/include/asm/atomic_no.h index 6bb6748..5674cb9 100644 --- a/arch/m68k/include/asm/atomic_no.h +++ b/arch/m68k/include/asm/atomic_no.h @@ -151,5 +151,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) #define atomic_dec_return(v) atomic_sub_return(1,(v)) #define atomic_inc_return(v) atomic_add_return(1,(v)) -#include <asm-generic/atomic.h> +#include <asm-generic/atomic-long.h> #endif /* __ARCH_M68KNOMMU_ATOMIC __ */ |