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>

authored by

Arnd Bergmann and committed by

Arnd Bergmann 17 years ago 72099ed2 e64a1617

+27 -26

25 changed files

expand all collapse all

arch

alpha

include

asm

atomic.h

arm

include

asm

atomic.h

avr32

include

asm

atomic.h

blackfin

include

asm

atomic.h

cris

include

asm

atomic.h

frv

include

asm

atomic.h

h8300

include

asm

atomic.h

ia64

include

asm

atomic.h

m32r

include

asm

atomic.h

m68k

include

asm

atomic_mm.h

atomic_no.h

microblaze

include

asm

atomic.h

mips

include

asm

atomic.h

mn10300

include

asm

atomic.h

parisc

include

asm

atomic.h

powerpc

include

asm

atomic.h

s390

include

asm

atomic.h

include

asm

atomic.h

sparc

include

asm

atomic_32.h

atomic_64.h

x86

include

asm

atomic_32.h

atomic_64.h

xtensa

include

asm

atomic.h

include

asm-generic

atomic-long.h

bitops

atomic.h

+1 -1

arch/alpha/include/asm/atomic.h

reviewed

··· 256 256 #define smp_mb__before_atomic_inc() smp_mb() 257 257 #define smp_mb__after_atomic_inc() smp_mb() 258 258 259 259 - #include <asm-generic/atomic.h> 259 259 + #include <asm-generic/atomic-long.h> 260 260 #endif /* _ALPHA_ATOMIC_H */

+1 -1

arch/arm/include/asm/atomic.h

reviewed

··· 249 249 #define smp_mb__before_atomic_inc() smp_mb() 250 250 #define smp_mb__after_atomic_inc() smp_mb() 251 251 252 252 - #include <asm-generic/atomic.h> 252 252 + #include <asm-generic/atomic-long.h> 253 253 #endif 254 254 #endif

+1 -1

arch/avr32/include/asm/atomic.h

reviewed

··· 196 196 #define smp_mb__before_atomic_inc() barrier() 197 197 #define smp_mb__after_atomic_inc() barrier() 198 198 199 199 - #include <asm-generic/atomic.h> 199 199 + #include <asm-generic/atomic-long.h> 200 200 201 201 #endif /* __ASM_AVR32_ATOMIC_H */

+1 -1

arch/blackfin/include/asm/atomic.h

reviewed

··· 208 208 #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) 209 209 #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) 210 210 211 211 - #include <asm-generic/atomic.h> 211 211 + #include <asm-generic/atomic-long.h> 212 212 213 213 #endif /* __ARCH_BLACKFIN_ATOMIC __ */

+1 -1

arch/cris/include/asm/atomic.h

reviewed

··· 158 158 #define smp_mb__before_atomic_inc() barrier() 159 159 #define smp_mb__after_atomic_inc() barrier() 160 160 161 161 - #include <asm-generic/atomic.h> 161 161 + #include <asm-generic/atomic-long.h> 162 162 #endif

+1 -1

arch/frv/include/asm/atomic.h

reviewed

··· 194 194 195 195 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) 196 196 197 197 - #include <asm-generic/atomic.h> 197 197 + #include <asm-generic/atomic-long.h> 198 198 #endif /* _ASM_ATOMIC_H */

+1 -1

arch/h8300/include/asm/atomic.h

reviewed

··· 141 141 #define smp_mb__before_atomic_inc() barrier() 142 142 #define smp_mb__after_atomic_inc() barrier() 143 143 144 144 - #include <asm-generic/atomic.h> 144 144 + #include <asm-generic/atomic-long.h> 145 145 #endif /* __ARCH_H8300_ATOMIC __ */

+1 -1

arch/ia64/include/asm/atomic.h

reviewed

··· 216 216 #define smp_mb__before_atomic_inc() barrier() 217 217 #define smp_mb__after_atomic_inc() barrier() 218 218 219 219 - #include <asm-generic/atomic.h> 219 219 + #include <asm-generic/atomic-long.h> 220 220 #endif /* _ASM_IA64_ATOMIC_H */

+1 -1

arch/m32r/include/asm/atomic.h

reviewed

··· 314 314 #define smp_mb__before_atomic_inc() barrier() 315 315 #define smp_mb__after_atomic_inc() barrier() 316 316 317 317 - #include <asm-generic/atomic.h> 317 317 + #include <asm-generic/atomic-long.h> 318 318 #endif /* _ASM_M32R_ATOMIC_H */

+1 -1

arch/m68k/include/asm/atomic_mm.h

reviewed

··· 192 192 #define smp_mb__before_atomic_inc() barrier() 193 193 #define smp_mb__after_atomic_inc() barrier() 194 194 195 195 - #include <asm-generic/atomic.h> 195 195 + #include <asm-generic/atomic-long.h> 196 196 #endif /* __ARCH_M68K_ATOMIC __ */

+1 -1

arch/m68k/include/asm/atomic_no.h

reviewed

··· 151 151 #define atomic_dec_return(v) atomic_sub_return(1,(v)) 152 152 #define atomic_inc_return(v) atomic_add_return(1,(v)) 153 153 154 154 - #include <asm-generic/atomic.h> 154 154 + #include <asm-generic/atomic-long.h> 155 155 #endif /* __ARCH_M68KNOMMU_ATOMIC __ */

+1 -1

arch/microblaze/include/asm/atomic.h

reviewed

··· 118 118 #define smp_mb__before_atomic_inc() barrier() 119 119 #define smp_mb__after_atomic_inc() barrier() 120 120 121 121 - #include <asm-generic/atomic.h> 121 121 + #include <asm-generic/atomic-long.h> 122 122 123 123 #endif /* _ASM_MICROBLAZE_ATOMIC_H */

+1 -1

arch/mips/include/asm/atomic.h

reviewed

··· 793 793 #define smp_mb__before_atomic_inc() smp_llsc_mb() 794 794 #define smp_mb__after_atomic_inc() smp_llsc_mb() 795 795 796 796 - #include <asm-generic/atomic.h> 796 796 + #include <asm-generic/atomic-long.h> 797 797 798 798 #endif /* _ASM_ATOMIC_H */

+1 -1

arch/mn10300/include/asm/atomic.h

reviewed

··· 151 151 #define smp_mb__before_atomic_inc() barrier() 152 152 #define smp_mb__after_atomic_inc() barrier() 153 153 154 154 - #include <asm-generic/atomic.h> 154 154 + #include <asm-generic/atomic-long.h> 155 155 156 156 #endif /* __KERNEL__ */ 157 157 #endif /* _ASM_ATOMIC_H */

+1 -1

arch/parisc/include/asm/atomic.h

reviewed

··· 338 338 339 339 #endif /* CONFIG_64BIT */ 340 340 341 341 - #include <asm-generic/atomic.h> 341 341 + #include <asm-generic/atomic-long.h> 342 342 343 343 #endif /* _ASM_PARISC_ATOMIC_H_ */

+1 -1

arch/powerpc/include/asm/atomic.h

reviewed

··· 472 472 473 473 #endif /* __powerpc64__ */ 474 474 475 475 - #include <asm-generic/atomic.h> 475 475 + #include <asm-generic/atomic-long.h> 476 476 #endif /* __KERNEL__ */ 477 477 #endif /* _ASM_POWERPC_ATOMIC_H_ */

+1 -1

arch/s390/include/asm/atomic.h

reviewed

··· 275 275 #define smp_mb__before_atomic_inc() smp_mb() 276 276 #define smp_mb__after_atomic_inc() smp_mb() 277 277 278 278 - #include <asm-generic/atomic.h> 278 278 + #include <asm-generic/atomic-long.h> 279 279 #endif /* __KERNEL__ */ 280 280 #endif /* __ARCH_S390_ATOMIC__ */

+1 -1

arch/sh/include/asm/atomic.h

reviewed

··· 84 84 #define smp_mb__before_atomic_inc() barrier() 85 85 #define smp_mb__after_atomic_inc() barrier() 86 86 87 87 - #include <asm-generic/atomic.h> 87 87 + #include <asm-generic/atomic-long.h> 88 88 #endif /* __ASM_SH_ATOMIC_H */

+1 -1

arch/sparc/include/asm/atomic_32.h

reviewed

··· 161 161 162 162 #endif /* !(__KERNEL__) */ 163 163 164 164 - #include <asm-generic/atomic.h> 164 164 + #include <asm-generic/atomic-long.h> 165 165 #endif /* !(__ARCH_SPARC_ATOMIC__) */

+1 -1

arch/sparc/include/asm/atomic_64.h

reviewed

··· 114 114 #define smp_mb__before_atomic_inc() barrier() 115 115 #define smp_mb__after_atomic_inc() barrier() 116 116 117 117 - #include <asm-generic/atomic.h> 117 117 + #include <asm-generic/atomic-long.h> 118 118 #endif /* !(__ARCH_SPARC64_ATOMIC__) */

+1 -1

arch/x86/include/asm/atomic_32.h

reviewed

··· 247 247 #define smp_mb__before_atomic_inc() barrier() 248 248 #define smp_mb__after_atomic_inc() barrier() 249 249 250 250 - #include <asm-generic/atomic.h> 250 250 + #include <asm-generic/atomic-long.h> 251 251 #endif /* _ASM_X86_ATOMIC_32_H */

+1 -1

arch/x86/include/asm/atomic_64.h

reviewed

··· 455 455 #define smp_mb__before_atomic_inc() barrier() 456 456 #define smp_mb__after_atomic_inc() barrier() 457 457 458 458 - #include <asm-generic/atomic.h> 458 458 + #include <asm-generic/atomic-long.h> 459 459 #endif /* _ASM_X86_ATOMIC_64_H */

+1 -1

arch/xtensa/include/asm/atomic.h

reviewed

··· 292 292 #define smp_mb__before_atomic_inc() barrier() 293 293 #define smp_mb__after_atomic_inc() barrier() 294 294 295 295 - #include <asm-generic/atomic.h> 295 295 + #include <asm-generic/atomic-long.h> 296 296 #endif /* __KERNEL__ */ 297 297 298 298 #endif /* _XTENSA_ATOMIC_H */

+3 -3

include/asm-generic/atomic.h include/asm-generic/atomic-long.h

reviewed

··· 1 1 - #ifndef _ASM_GENERIC_ATOMIC_H 2 2 - #define _ASM_GENERIC_ATOMIC_H 1 1 + #ifndef _ASM_GENERIC_ATOMIC_LONG_H 2 2 + #define _ASM_GENERIC_ATOMIC_LONG_H 3 3 /* 4 4 * Copyright (C) 2005 Silicon Graphics, Inc. 5 5 * Christoph Lameter ··· 255 255 256 256 #endif /* BITS_PER_LONG == 64 */ 257 257 258 258 - #endif /* _ASM_GENERIC_ATOMIC_H */ 258 258 + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */

include/asm-generic/bitops/atomic.h

reviewed

··· 2 2 #define _ASM_GENERIC_BITOPS_ATOMIC_H_ 3 3 4 4 #include <asm/types.h> 5 5 + #include <asm/system.h> 5 6 6 7 #ifdef CONFIG_SMP 7 8 #include <asm/spinlock.h>