diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-03-04 20:25:13 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-10 16:39:45 +0000 |
commit | 7f4dbf0a1246addb89fe6adb09deece29fc1b154 (patch) | |
tree | be3472bf5dc7bae524c50df80c777eac2de28d85 /meta | |
parent | 011c85aee8faf8905e8bbe354a0761ff5b53774d (diff) | |
download | poky-7f4dbf0a1246addb89fe6adb09deece29fc1b154.tar.gz |
linux-yocto/5.10: Fix ramoops/ftrace
Integrating the following commit(s) to linux-yocto/5.10:
253c752ed120 pstore/ftrace: Add and use ftrace_test_recursion_trylock_safe
356e8a12bd66 pstore/ftrace: Add recursion protection to the ftrace callback
334706a1e873 ftrace: Add ftrace_test_recursion_trylock() helper function
78c260d7f60b ftrace: Move the recursion testing into global headers
(From OE-Core rev: 3148b11ba72ac483b26f4c4313cdf22712341c6f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b848a47033f492eaa0d5a02e42374b493734473e)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 |
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index dcb447a09c..a3b2e2124e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "5c627c3d0740ef68beef456aaf7ef104315a8f7f" | 14 | SRCREV_machine ?= "b8dfdbe4d5a7b790bd2ecdb2889846e036469d25" |
15 | SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" | 15 | SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 042023de33..f9e061ab0a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "ce4e423e88244adab0deef2f9d021b2bf6d492ba" | 18 | SRCREV_machine_qemuarm ?= "e6fb3720c9823cc706e8c6441cfd382b52bf7ae5" |
19 | SRCREV_machine ?= "cc09c000260f49e35e85a96853dd01404e6aa80a" | 19 | SRCREV_machine ?= "57631093be11dd9606bbe8916b9f35bc9b6fe130" |
20 | SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" | 20 | SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 83daecc4cd..94c2cc9cea 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" | |||
13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" | 13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" |
14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" | 14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine_qemuarm ?= "54d10cbfb44b9449f3962d962c6ec0d2e31017e8" | 16 | SRCREV_machine_qemuarm ?= "778c2d4c9a4798b90ed3b5609ccbc2fa8b785778" |
17 | SRCREV_machine_qemuarm64 ?= "1048394a0538b9b282c1f36f4de7e4ab814c90bf" | 17 | SRCREV_machine_qemuarm64 ?= "6c6e9a984aa0a6bb2a11528c27023c588064422d" |
18 | SRCREV_machine_qemumips ?= "0214a416a56f01fed65e4b7818470139dc2b1286" | 18 | SRCREV_machine_qemumips ?= "3bcde31e0d5e48a2fd21f7d6300a7b5d625e5760" |
19 | SRCREV_machine_qemuppc ?= "b678c6d8d47e6e67aefa985fea85fe3026f2c809" | 19 | SRCREV_machine_qemuppc ?= "20fb5e330325ade20c8c3c2de7a64d9994298af6" |
20 | SRCREV_machine_qemuriscv64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" | 20 | SRCREV_machine_qemuriscv64 ?= "253c752ed120276124a8463d996b30af0db6f547" |
21 | SRCREV_machine_qemuriscv32 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" | 21 | SRCREV_machine_qemuriscv32 ?= "253c752ed120276124a8463d996b30af0db6f547" |
22 | SRCREV_machine_qemux86 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" | 22 | SRCREV_machine_qemux86 ?= "253c752ed120276124a8463d996b30af0db6f547" |
23 | SRCREV_machine_qemux86-64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" | 23 | SRCREV_machine_qemux86-64 ?= "253c752ed120276124a8463d996b30af0db6f547" |
24 | SRCREV_machine_qemumips64 ?= "8d571427e05d1a8c7f7b0d32f291941429865ada" | 24 | SRCREV_machine_qemumips64 ?= "89e951f3655bd59f7564bd09c106186833702f12" |
25 | SRCREV_machine ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" | 25 | SRCREV_machine ?= "253c752ed120276124a8463d996b30af0db6f547" |
26 | SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" | 26 | SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" |
27 | 27 | ||
28 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 28 | # remap qemuarm to qemuarma15 for the 5.8 kernel |
29 | # KMACHINE_qemuarm ?= "qemuarma15" | 29 | # KMACHINE_qemuarm ?= "qemuarma15" |