From 3796bf5d44367aa2ac3e1bbc555756a0a088fa1e Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 8 Oct 2016 00:42:45 +0000 Subject: [PATCH] core/linux-aarch64 to 4.8.1-1 --- ...ow-mac-address-to-be-set-as-a-parame.patch | 4 +- ...ix-broken-interrupt-trigger-settings.patch | 4 +- ...N-as-an-assert-is-_never_-acceptable.patch | 52 ------------------- core/linux-aarch64/PKGBUILD | 16 +++--- 4 files changed, 11 insertions(+), 65 deletions(-) delete mode 100644 core/linux-aarch64/0003-Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch diff --git a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index d35c5c2b2..65a34ce4e 100644 --- a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,7 +1,7 @@ -From 86676a4ef2769fa5af6b3b59bfcbef96a93ed734 Mon Sep 17 00:00:00 2001 +From db07c943b91eb4afcb52643ae867eba29dd7334c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 1/3] net/smsc95xx: Allow mac address to be set as a parameter +Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/core/linux-aarch64/0002-arm64-dts-qcom-Fix-broken-interrupt-trigger-settings.patch b/core/linux-aarch64/0002-arm64-dts-qcom-Fix-broken-interrupt-trigger-settings.patch index 0c3007089..b88cebb56 100644 --- a/core/linux-aarch64/0002-arm64-dts-qcom-Fix-broken-interrupt-trigger-settings.patch +++ b/core/linux-aarch64/0002-arm64-dts-qcom-Fix-broken-interrupt-trigger-settings.patch @@ -1,7 +1,7 @@ -From 18215be4c5ba503580fd18abf1f1bd4ba7f80820 Mon Sep 17 00:00:00 2001 +From a4338d28dfd8228fdcd8da798ca08ff66e53afe9 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Thu, 11 Aug 2016 18:50:50 +0100 -Subject: [PATCH 2/3] arm64: dts: qcom: Fix broken interrupt trigger settings +Subject: [PATCH 2/2] arm64: dts: qcom: Fix broken interrupt trigger settings When a device uses the GIC as its interrupt controller and generates SPIs, only the values 1 (edge rising) and 4 (level high) are legal. diff --git a/core/linux-aarch64/0003-Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch b/core/linux-aarch64/0003-Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch deleted file mode 100644 index 7e4f932db..000000000 --- a/core/linux-aarch64/0003-Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3568393d18ecc488c8008c7d641dfeb659f2a68c Mon Sep 17 00:00:00 2001 -From: Linus Torvalds -Date: Mon, 3 Oct 2016 21:03:48 -0700 -Subject: [PATCH 3/3] Using BUG_ON() as an assert() is _never_ acceptable - -That just generally kills the machine, and makes debugging only much -harder, since the traces may long be gone. - -Debugging by assert() is a disease. Don't do it. If you can continue, -you're much better off doing so with a live machine where you have a -much higher chance that the report actually makes it to the system logs, -rather than result in a machine that is just completely dead. - -The only valid situation for BUG_ON() is when continuing is not an -option, because there is massive corruption. But if you are just -verifying that something is true, you warn about your broken assumptions -(preferably just once), and limp on. - -Fixes: 22f2ac51b6d6 ("mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page()") -Cc: Johannes Weiner -Cc: Miklos Szeredi -Cc: Andrew Morton -Signed-off-by: Linus Torvalds ---- - include/linux/swap.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/linux/swap.h b/include/linux/swap.h -index 4a529c9..e1d7614 100644 ---- a/include/linux/swap.h -+++ b/include/linux/swap.h -@@ -257,7 +257,7 @@ static inline void workingset_node_pages_inc(struct radix_tree_node *node) - - static inline void workingset_node_pages_dec(struct radix_tree_node *node) - { -- VM_BUG_ON(!workingset_node_pages(node)); -+ VM_WARN_ON_ONCE(!workingset_node_pages(node)); - node->count--; - } - -@@ -273,7 +273,7 @@ static inline void workingset_node_shadows_inc(struct radix_tree_node *node) - - static inline void workingset_node_shadows_dec(struct radix_tree_node *node) - { -- VM_BUG_ON(!workingset_node_shadows(node)); -+ VM_WARN_ON_ONCE(!workingset_node_shadows(node)); - node->count -= 1U << RADIX_TREE_COUNT_SHIFT; - } - --- -2.10.0 - diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD index 1bcb9b387..07249802e 100644 --- a/core/linux-aarch64/PKGBUILD +++ b/core/linux-aarch64/PKGBUILD @@ -7,24 +7,23 @@ pkgbase=linux-aarch64 _srcname=linux-4.8 _kernelname=${pkgbase#linux} _desc="AArch64 multi-platform" -pkgver=4.8.0 -pkgrel=2 +pkgver=4.8.1 +pkgrel=1 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" - #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" + "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" '0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch' '0002-arm64-dts-qcom-Fix-broken-interrupt-trigger-settings.patch' - '0003-Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch' 'config' 'linux.preset') md5sums=('c1af0afbd3df35c1ccdc7a5118cd2d07' - '7e48ab89ea66f92677eb1514163fc5f8' - 'f064d74178f3155262f76224c9f3daa0' - '8f7dff8fca4221bf36019db0c905478f' + '349734be5387f1605074515ad7207627' + '8ed2ac68adaec29a488542f613de6ad9' + 'e6fca8e5ddf634762d9ff7daa5e37a76' '8c6b2df46bc0ca7b99d85da61fba64d6' 'b5ef67d6086e20de7b82265f562f88b1') @@ -32,12 +31,11 @@ prepare() { cd "${srcdir}/${_srcname}" # add upstream patch - #git apply --whitespace=nowarn ../patch-${pkgver} + git apply --whitespace=nowarn ../patch-${pkgver} # ALARM patches git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch git apply ../0002-arm64-dts-qcom-Fix-broken-interrupt-trigger-settings.patch - git apply ../0003-Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch cat "${srcdir}/config" > ./.config