From e610fb7cc22447441f18a9b1bffe58aadb6aaab6 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 2 Feb 2021 22:24:02 -0500 Subject: linux-yocto-rt/5.4: fix 5.4-stable caused build breakage 5.4-stable included a backport of: Author: Eric W. Biederman Date: Thu Dec 3 14:11:13 2020 -0600 rwsem: Implement down_read_interruptible [ Upstream commit 31784cff7ee073b34d6eddabb95e3be2880a425c ] In preparation for converting exec_update_mutex to a rwsem so that multiple readers can execute in parallel and not deadlock, add down_read_interruptible. This is needed for perf_event_open to be converted (with no semantic changes) from working on a mutex to wroking on a rwsem. Signed-off-by: Eric W. Biederman Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/87k0tybqfy.fsf@x220.int.ebiederm.org Signed-off-by: Sasha Levin We implement a -rt variant to fix the build issues. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 4 insertions(+), 4 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 74028376d3..c23fb328d4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "06c752971a7cb66123ab2b3731044103fc5662e0" -SRCREV_meta ?= "70cec8c033a6f5c48f0a93374f0bfc25240f14fd" +SRCREV_machine ?= "6b0893e9fddb5473b181b29059fe64980f353c83" +SRCREV_meta ?= "d676bf5ff7b7071e14f44498d2482c0a596f14cd" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" 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 8dfa5357bd..32fbf9dc55 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "c65142e64f3d705d0b978b44394d274165d872b2" SRCREV_machine ?= "d4bbfa0e2416ced1a3b4d05fa853e3171f034c57" -SRCREV_meta ?= "70cec8c033a6f5c48f0a93374f0bfc25240f14fd" +SRCREV_meta ?= "d676bf5ff7b7071e14f44498d2482c0a596f14cd" 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 ecdc8524c3..3a36694f9c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "d4bbfa0e2416ced1a3b4d05fa853e3171f034c57" SRCREV_machine_qemux86-64 ?= "d4bbfa0e2416ced1a3b4d05fa853e3171f034c57" SRCREV_machine_qemumips64 ?= "e4714b9bb683cf08909e6dc2e91fd508e56bfbc2" SRCREV_machine ?= "d4bbfa0e2416ced1a3b4d05fa853e3171f034c57" -SRCREV_meta ?= "70cec8c033a6f5c48f0a93374f0bfc25240f14fd" +SRCREV_meta ?= "d676bf5ff7b7071e14f44498d2482c0a596f14cd" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg