From a048606d7b7380d52dcacd24e923c9ff9dca47ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Sat, 22 Oct 2016 04:31:59 -0300
Subject: linux-libre-grsec-knock-1:4.7.9_gnu.r201610200819-1: updating version

---
 ...-error-of-atomic64_xchg_unchecked_relaxed.patch | 33 ++++++++++++++++++++++
 kernels/linux-libre-grsec-knock/PKGBUILD           | 13 ++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 kernels/linux-libre-grsec-knock/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch

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)
diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index b1c7c39ae..f72403153 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -10,9 +10,9 @@
 
 pkgbase=linux-libre-grsec-knock
 _pkgbasever=4.7-gnu
-_pkgver=4.7.8-gnu
+_pkgver=4.7.9-gnu
 _grsecver=3.1
-_timestamp=201610161720
+_timestamp=201610200819
 _knockpatchver=4.7_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -58,6 +58,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
         "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig"
         '0001-ARM-disable-implicit-function-declaration-error.patch'
+        '0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch'
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
@@ -70,9 +71,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0010-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
 sha256sums=('f483e595e0ad9a9d1b3afd20e4ecb0b798cf16eb31e79a7b99311eb9c061032a'
             'SKIP'
-            'ac0566c2b8f25bc124d245538f960ad7e4f0af4b09ae737d7092180100282994'
+            'defe6e7665ac954c806771ff88bbefbd417de1f8562402204e0677954ed7035a'
             'SKIP'
-            'c0901ae1335d648739be7d87a2dd54b57d27b8ff74b4761077e0c96edc72dc28'
+            '7621eddc4aea6c1a77e7ba67102c3c714999e85a8b675784e43c26118234b0b2'
             'SKIP'
             'ae7ea068d703220716591ed3d865238b7ac140181b83d7eb466cc9c140933113'
             'SKIP'
@@ -92,6 +93,7 @@ sha256sums=('f483e595e0ad9a9d1b3afd20e4ecb0b798cf16eb31e79a7b99311eb9c061032a'
             'f0299fc4d04eb678c876752796d26bbca67646b640a847b85630cd3f0aad360b'
             'SKIP'
             '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
+            '34c74396b40f1a22a94c1e49e6ae1aaed2fb55f28225dfa9de2cb6f9f4607d21'
             '1620f9ed6f52250c540a88d5182be0caf8b50b93f83c85fec02c225ae121c9c1'
             'd61c4da6d06ad61b20058dd8684aba5dc581e75264834e3a03f958f941bfeea5'
             'b0d21ae300fb667350323190a9217e7e19834f9c216627e927c01feda63341f8'
@@ -144,6 +146,9 @@ prepare() {
     # disable implicit function declaration error since grsecurity patches conflicts against some RCN modules
     patch -p1 -i "${srcdir}/0001-ARM-disable-implicit-function-declaration-error.patch"
 
+    # fix redefinition error of atomic64_xchg_unchecked_relaxed
+    patch -p1 -i "${srcdir}/0002-ARM-fix-redefinition-error-of-atomic64_xchg_unchecked_relaxed.patch"
+
     # ALARM patches
     patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
     patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
-- 
cgit v1.2.3-2-g168b