summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-grsec-xen/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch
blob: 5c1c1345492dc7a6361ec3fe13a5f36e2ab3a4be (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 5fbb312..285d152 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -554,13 +554,13 @@ atomic64_cmpxchg_relaxed(atomic64_t *ptr, long long old, long long new)
 
 	return oldval;
 }
-#define atomic64_cmpxchg_relaxed	atomic64_cmpxchg_relaxed
 
 static inline long long
 atomic64_cmpxchg_unchecked_relaxed(atomic64_unchecked_t *ptr, long long old, long long new)
 {
 	return atomic64_cmpxchg_relaxed((atomic64_t *)ptr, old, new);
 }
+#define atomic64_cmpxchg_relaxed	atomic64_cmpxchg_relaxed
 #define atomic64_cmpxchg_unchecked_relaxed	atomic64_cmpxchg_unchecked_relaxed
 
 static inline long long atomic64_xchg_relaxed(atomic64_t *ptr, long long new)
@@ -581,12 +581,12 @@ static inline long long atomic64_xchg_relaxed(atomic64_t *ptr, long long new)
 
 	return result;
 }
-#define atomic64_xchg_relaxed		atomic64_xchg_relaxed
 
 static inline long long atomic64_xchg_unchecked_relaxed(atomic64_unchecked_t *ptr, long long new)
 {
 	return atomic64_xchg_relaxed((atomic64_t *)ptr, new);
 }
+#define atomic64_xchg_relaxed		atomic64_xchg_relaxed
 #define atomic64_xchg_unchecked_relaxed		atomic64_xchg_unchecked_relaxed
 
 static inline long long atomic64_dec_if_positive(atomic64_t *v)