diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-03-24 19:05:01 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-25 10:02:50 +0000 |
commit | 7d963a685b204dd49b6e33d2eab8f7661c46e5cc (patch) | |
tree | 40c84d1abfdee6e471820793b4915ac58bfe8c9f /meta | |
parent | 6fc36177aea39377addd5ac42676dcfc80047efe (diff) | |
download | poky-7d963a685b204dd49b6e33d2eab8f7661c46e5cc.tar.gz |
linux-yocto/5.4: KVM: LAPIC: Mark hrtimer for period or oneshot mode to expire in hard interrupt context
Integrating the following commits to linux-yocto/5.4:
9065d188f874 KVM: LAPIC: Mark hrtimer for period or oneshot mode to expire in hard interrupt context
(From OE-Core rev: ac42114430c9cccb21c296c12f31f405ccb99329)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 9d237ee32f..2eb1e846e8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | |||
@@ -11,7 +11,7 @@ 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 ?= "a069c47171c8b2510401dba1922b49b294c19b0e" | 14 | SRCREV_machine ?= "87d86ed4bfc78baee66933982c2962309fca4ffe" |
15 | SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" | 15 | SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" |
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 \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 02beca0097..18ff195af3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | |||
@@ -15,8 +15,8 @@ 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 ?= "84a0aabc9db1eba2fbfcbd80b3c538cd73f0b03c" | 18 | SRCREV_machine_qemuarm ?= "b6bb0cf2d13aca397c216c2323985c87ac98919a" |
19 | SRCREV_machine ?= "4cd12df48b83cef9cc7d6b80b128afbf68746718" | 19 | SRCREV_machine ?= "9065d188f87410b7c862e44ff3143648c1ad2295" |
20 | SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" | 20 | SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 8bad042528..8db3d1c974 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb | |||
@@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" | |||
12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" | 12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" |
13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" | 13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" |
14 | 14 | ||
15 | SRCREV_machine_qemuarm ?= "f4bf0307957258b20048e704ff3683437d7b0373" | 15 | SRCREV_machine_qemuarm ?= "9f04047a4f31450342960f04571194122e890461" |
16 | SRCREV_machine_qemuarm64 ?= "4cd12df48b83cef9cc7d6b80b128afbf68746718" | 16 | SRCREV_machine_qemuarm64 ?= "9065d188f87410b7c862e44ff3143648c1ad2295" |
17 | SRCREV_machine_qemumips ?= "06bdb6af393b84e2c1a6f34b67bf4af36b9331e3" | 17 | SRCREV_machine_qemumips ?= "f6f24e8e404d1debf07cb5793a183ba8e759d09b" |
18 | SRCREV_machine_qemuppc ?= "4cd12df48b83cef9cc7d6b80b128afbf68746718" | 18 | SRCREV_machine_qemuppc ?= "9065d188f87410b7c862e44ff3143648c1ad2295" |
19 | SRCREV_machine_qemuriscv64 ?= "4cd12df48b83cef9cc7d6b80b128afbf68746718" | 19 | SRCREV_machine_qemuriscv64 ?= "9065d188f87410b7c862e44ff3143648c1ad2295" |
20 | SRCREV_machine_qemux86 ?= "4cd12df48b83cef9cc7d6b80b128afbf68746718" | 20 | SRCREV_machine_qemux86 ?= "9065d188f87410b7c862e44ff3143648c1ad2295" |
21 | SRCREV_machine_qemux86-64 ?= "4cd12df48b83cef9cc7d6b80b128afbf68746718" | 21 | SRCREV_machine_qemux86-64 ?= "9065d188f87410b7c862e44ff3143648c1ad2295" |
22 | SRCREV_machine_qemumips64 ?= "958ee61d50f664b413f368a7573918a18a00d4ac" | 22 | SRCREV_machine_qemumips64 ?= "6f93582af92ab433d43c2a67a7ed871e5c229e55" |
23 | SRCREV_machine ?= "4cd12df48b83cef9cc7d6b80b128afbf68746718" | 23 | SRCREV_machine ?= "9065d188f87410b7c862e44ff3143648c1ad2295" |
24 | SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" | 24 | SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |