summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-grsec-knock/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kernels/linux-libre-grsec-knock/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch')
-rw-r--r--kernels/linux-libre-grsec-knock/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/kernels/linux-libre-grsec-knock/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch b/kernels/linux-libre-grsec-knock/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch
new file mode 100644
index 000000000..5c1c13454
--- /dev/null
+++ b/kernels/linux-libre-grsec-knock/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch
@@ -0,0 +1,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)