diff options
Diffstat (limited to 'kernels/linux-libre-grsec-knock')
| -rw-r--r-- | kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch | 26 | ||||
| -rw-r--r-- | kernels/linux-libre-grsec-knock/PKGBUILD | 14 |
2 files changed, 4 insertions, 36 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch b/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch deleted file mode 100644 index 0f311bdc2..000000000 --- a/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/linux/atomic.h b/include/linux/atomic.h -index a8efdc4..b65a2b9 100644 ---- a/include/linux/atomic.h -+++ b/include/linux/atomic.h -@@ -103,6 +103,11 @@ - #define atomic_inc_return(...) \ - __atomic_op_fence(atomic_inc_return, __VA_ARGS__) - #endif -+ -+#ifndef atomic_inc_return_unchecked -+#define atomic_inc_return_unchecked(...) \ -+ __atomic_op_fence(atomic_inc_return_unchecked, __VA_ARGS__) -+#endif - #endif /* atomic_inc_return_relaxed */ - - /* atomic_sub_return_relaxed */ -@@ -255,6 +260,11 @@ - #define atomic64_inc_return(...) \ - __atomic_op_fence(atomic64_inc_return, __VA_ARGS__) - #endif -+ -+#ifndef atomic64_inc_return_unchecked -+#define atomic64_inc_return_unchecked(...) \ -+ __atomic_op_fence(atomic64_inc_return_unchecked, __VA_ARGS__) -+#endif - #endif /* atomic64_inc_return_relaxed */ diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index dbc5f95c1..59562452c 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.4-gnu -_pkgver=4.4.4-gnu +_pkgver=4.4.5-gnu _grsecver=3.1 -_timestamp=201603032158 +_timestamp=201603142220 _knockpatchver=4.2_2 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -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-declaration-of-function-atomic_inc_return_unchecked.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 +69,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0009-ARM-dts-dove-add-Dove-divider-clocks.patch') sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' - '5b52578afb3bab7a50748e9b8e26bd9df851b3dcfbb55079d2abf3d3ad46aaff' + '4adf791c9d7e52ac72c60d337e3fa59f8cef5fb1f497a192345b70ac915674f1' 'SKIP' - 'bd005e43a54213a4dc065cee68cbaacae54547c916d21762547ee14bec5d6726' + 'a4b7f9354fe09ea8938c79d2d158600bba426190a009900d3af33e0fe1d3b8c2' 'SKIP' 'c7c4ab580f00dca4114c185812a963e73217e6bf86406c240d669026dc3f98a4' 'SKIP' @@ -91,7 +90,6 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808' '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319' 'SKIP' - 'faa25001a32551b5201c4e803a913100ef875a750e01596d202b5c61a3f4be82' 'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817' '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4' '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08' @@ -137,10 +135,6 @@ prepare() { # RCN patch (CM3 firmware deblobbed) git apply -v "${srcdir}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch" - # fix implicit declaration of function 'atomic_inc_return_unchecked' - # https://forums.grsecurity.net/viewtopic.php?f=3&t=4410 - patch -p1 -i "${srcdir}/0001-ARM-fix-implicit-declaration-of-function-atomic_inc_return_unchecked.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" |