linux-libre-grsec{,-knock}: minor fix

4 files changed, 0 insertions, 34 deletions

diff --git a/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-function-declaration.patch b/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-function-declaration.patch
deleted file mode 100644
index 3b3015b1c..000000000
--- a/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-function-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
-index b24b581..c96f179 100644
---- a/include/asm-generic/atomic-long.h
-+++ b/include/asm-generic/atomic-long.h
-@@ -225,6 +225,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
- 	ATOMIC_LONG_PFX(_inc_not_zero)((ATOMIC_LONG_PFX(_t) *)(l))
- 
- #ifdef CONFIG_PAX_REFCOUNT
-+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
- static inline void pax_refcount_needs_these_functions(void)
- {
- 	atomic_read_unchecked((atomic_unchecked_t *)NULL);
diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index b3f4dd9cc..0951fb1d8 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -58,7 +58,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # armv7h patches
         "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-fix-implicit-function-declaration.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'
@@ -91,7 +90,6 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
             '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
             '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
             'SKIP'
-            'dcf02c2711307e577a487c90d9faaa6ec7ea784dbdca8226c05a65f7897f5de9'
             'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
             '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
             '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -137,9 +135,6 @@ prepare() {
     # RCN patch (CM3 firmware deblobbed)
     git apply -v "${srcdir}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
 
-    # fix implicit declaration of function
-    patch -p1 -i "${srcdir}/0001-ARM-fix-implicit-function-declaration.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"
diff --git a/libre/linux-libre-grsec/0001-ARM-fix-implicit-function-declaration.patch b/libre/linux-libre-grsec/0001-ARM-fix-implicit-function-declaration.patch
deleted file mode 100644
index 3b3015b1c..000000000
--- a/libre/linux-libre-grsec/0001-ARM-fix-implicit-function-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
-index b24b581..c96f179 100644
---- a/include/asm-generic/atomic-long.h
-+++ b/include/asm-generic/atomic-long.h
-@@ -225,6 +225,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
- 	ATOMIC_LONG_PFX(_inc_not_zero)((ATOMIC_LONG_PFX(_t) *)(l))
- 
- #ifdef CONFIG_PAX_REFCOUNT
-+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
- static inline void pax_refcount_needs_these_functions(void)
- {
- 	atomic_read_unchecked((atomic_unchecked_t *)NULL);
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 79164ab9f..2068f5e95 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -53,7 +53,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # armv7h patches
         "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-fix-implicit-function-declaration.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'
@@ -84,7 +83,6 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
             '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
             '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
             'SKIP'
-            'dcf02c2711307e577a487c90d9faaa6ec7ea784dbdca8226c05a65f7897f5de9'
             'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
             '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
             '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -126,9 +124,6 @@ prepare() {
     # RCN patch (CM3 firmware deblobbed)
     git apply -v "${srcdir}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
 
-    # fix implicit declaration of function
-    patch -p1 -i "${srcdir}/0001-ARM-fix-implicit-function-declaration.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"