aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2007-02-21 04:55:55 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-21 04:55:55 -0500
commitde61c9341ba144f6f21fdaae48ffbd811fc6637f (patch)
tree43e7cf1549f17bbd18a936806ced2bda21f07de4
parent4562c9fffc3f8fca99f22671ad497aedd1737a5e (diff)
[S390] local_t cleanup : use asm-generic/local.h.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--include/asm-s390/local.h59
1 files changed, 1 insertions, 58 deletions
diff --git a/include/asm-s390/local.h b/include/asm-s390/local.h
index 86745a1b29b..c11c530f74d 100644
--- a/include/asm-s390/local.h
+++ b/include/asm-s390/local.h
@@ -1,58 +1 @@
1#ifndef _ASM_LOCAL_H #include <asm-generic/local.h>
2#define _ASM_LOCAL_H
3
4#include <linux/percpu.h>
5#include <asm/atomic.h>
6
7#ifndef __s390x__
8
9typedef atomic_t local_t;
10
11#define LOCAL_INIT(i) ATOMIC_INIT(i)
12#define local_read(v) atomic_read(v)
13#define local_set(v,i) atomic_set(v,i)
14
15#define local_inc(v) atomic_inc(v)
16#define local_dec(v) atomic_dec(v)
17#define local_add(i, v) atomic_add(i, v)
18#define local_sub(i, v) atomic_sub(i, v)
19
20#else
21
22typedef atomic64_t local_t;
23
24#define LOCAL_INIT(i) ATOMIC64_INIT(i)
25#define local_read(v) atomic64_read(v)
26#define local_set(v,i) atomic64_set(v,i)
27
28#define local_inc(v) atomic64_inc(v)
29#define local_dec(v) atomic64_dec(v)
30#define local_add(i, v) atomic64_add(i, v)
31#define local_sub(i, v) atomic64_sub(i, v)
32
33#endif
34
35#define __local_inc(v) ((v)->counter++)
36#define __local_dec(v) ((v)->counter--)
37#define __local_add(i,v) ((v)->counter+=(i))
38#define __local_sub(i,v) ((v)->counter-=(i))
39
40/*
41 * Use these for per-cpu local_t variables: on some archs they are
42 * much more efficient than these naive implementations. Note they take
43 * a variable, not an address.
44 */
45#define cpu_local_read(v) local_read(&__get_cpu_var(v))
46#define cpu_local_set(v, i) local_set(&__get_cpu_var(v), (i))
47
48#define cpu_local_inc(v) local_inc(&__get_cpu_var(v))
49#define cpu_local_dec(v) local_dec(&__get_cpu_var(v))
50#define cpu_local_add(i, v) local_add((i), &__get_cpu_var(v))
51#define cpu_local_sub(i, v) local_sub((i), &__get_cpu_var(v))
52
53#define __cpu_local_inc(v) __local_inc(&__get_cpu_var(v))
54#define __cpu_local_dec(v) __local_dec(&__get_cpu_var(v))
55#define __cpu_local_add(i, v) __local_add((i), &__get_cpu_var(v))
56#define __cpu_local_sub(i, v) __local_sub((i), &__get_cpu_var(v))
57
58#endif /* _ASM_LOCAL_H */