diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-10-04 23:03:48 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-05 10:11:20 +0100 |
commit | 5f6a62c53f68fb6eb1ab31c43c4c88806dcaa03e (patch) | |
tree | 7a9e8eb3ceb780acae26a4ef6e5e4c548e957abf /meta/recipes-kernel | |
parent | 84113ca50ce53644987c55b47414adfae8499d28 (diff) | |
download | poky-5f6a62c53f68fb6eb1ab31c43c4c88806dcaa03e.tar.gz |
linux-yocto/4.8: fix BUG_ON() in workingset_node_shadows_dec() triggers
Paul Gotmaker pointed out that a last minute merge to the 4.8 kernel
has the potential to hard hang a kernel when VM debugging is enabled:
https://lkml.org/lkml/2016/10/4/1
He also pointed out the fix for it in commit 21f54dda
[Using BUG_ON() as an assert() is _never_ acceptable].
While that fix will loop through -stable into 4.8.1, that will
likely be too late for our release. So I've cherry picked the
change to make it available.
(From OE-Core rev: eb4b39d5ffbe93d363b05c57196bdac61fa09c59)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.8.bb | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb index 515f8783e9..90e1a4d747 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | |||
@@ -11,7 +11,7 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "cd97b2cf4bc73316204a5148d2b0f5fc5d2ecc19" | 14 | SRCREV_machine ?= "b266f7ba78f0cb3d7073e1bf7bd7dfc92bec7431" |
15 | SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93" | 15 | SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb index 8ed52ddbfc..1f026cf41b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | |||
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.8" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "707621a083512f037f749a711df3f4f1fb3ef842" | 12 | SRCREV_machine ?= "67813e7efa3a4614e209c2f058d92ef9a636441a" |
13 | SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93" | 13 | SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb index 71dc5ae35a..5e01abc8aa 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb | |||
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "fc4881574f295bf2480f95d7c3e279ab32b44d8a" | 14 | SRCREV_machine_qemuarm ?= "f46e49344b4c66a6f0917c5a2e9a1d146176519d" |
15 | SRCREV_machine_qemuarm64 ?= "707621a083512f037f749a711df3f4f1fb3ef842" | 15 | SRCREV_machine_qemuarm64 ?= "67813e7efa3a4614e209c2f058d92ef9a636441a" |
16 | SRCREV_machine_qemumips ?= "013be1e230a0173677dfbfc081aea63fd7c58ec8" | 16 | SRCREV_machine_qemumips ?= "5a299402ae58d61429ab091f94748550efe45858" |
17 | SRCREV_machine_qemuppc ?= "707621a083512f037f749a711df3f4f1fb3ef842" | 17 | SRCREV_machine_qemuppc ?= "67813e7efa3a4614e209c2f058d92ef9a636441a" |
18 | SRCREV_machine_qemux86 ?= "707621a083512f037f749a711df3f4f1fb3ef842" | 18 | SRCREV_machine_qemux86 ?= "67813e7efa3a4614e209c2f058d92ef9a636441a" |
19 | SRCREV_machine_qemux86-64 ?= "707621a083512f037f749a711df3f4f1fb3ef842" | 19 | SRCREV_machine_qemux86-64 ?= "67813e7efa3a4614e209c2f058d92ef9a636441a" |
20 | SRCREV_machine_qemumips64 ?= "7496d66804993fcfc569dd062f7e63a7490bc62f" | 20 | SRCREV_machine_qemumips64 ?= "674818dad577cdfc23c6c857aa2b769fc64e379c" |
21 | SRCREV_machine ?= "707621a083512f037f749a711df3f4f1fb3ef842" | 21 | SRCREV_machine ?= "67813e7efa3a4614e209c2f058d92ef9a636441a" |
22 | SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93" | 22 | SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \ |