From patchwork Tue Mar 8 14:20:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 4929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63535C4332F for ; Tue, 8 Mar 2022 14:21:30 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.8487.1646749289552279402 for ; Tue, 08 Mar 2022 06:21:29 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=nNiswyVh; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646749289; x=1678285289; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=zhAnOogpjSn+bBj6pXX6dsUjaFulpD8Yue/aK/C6ZvQ=; b=nNiswyVhSYFzrlvpfYRhHaTxxsUZdnXSuvUHhIRhGbS3XElHzF5ap6Po 4oq4dB96H3unIvFuCKXsiyHDwgs8/UJRkBidiPQgLfxAtgAifjj/bxG8e Lj/Oi93T9KQSCxKq5QcbbGA+5kmeBDy9yH7FjnSA2jYmldChxRFyzXGxX T+fxcIOULR/h52Il/xHacp2wCvdBzeL6uPEQUsy/oX87ZdjwdVA8SjXgu x4dvgosV4BY4m+iLxNte6tMhygRXhWHe/8pSzbLzrM1kRF1Bjj5CuAVBy cBFj+1KCLWuEwfRNI66U+CFCHo/TXejPdTW9STXuLk+NdKEy42JAo5408 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10279"; a="242130142" X-IronPort-AV: E=Sophos;i="5.90,165,1643702400"; d="scan'208";a="242130142" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2022 06:20:58 -0800 X-IronPort-AV: E=Sophos;i="5.90,165,1643702400"; d="scan'208";a="513120043" Received: from sktoh-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.225.176]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2022 06:20:57 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 13/15] linux-yocto/5.10: Fix ramoops/ftrace Date: Tue, 8 Mar 2022 22:20:04 +0800 Message-Id: <3148b11ba72ac483b26f4c4313cdf22712341c6f.1646748870.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 08 Mar 2022 14:21:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/162920 From: Bruce Ashfield 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b848a47033f492eaa0d5a02e42374b493734473e) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 4 ++-- .../linux/linux-yocto-tiny_5.10.bb | 6 ++--- 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 () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5c627c3d0740ef68beef456aaf7ef104315a8f7f" -SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" +SRCREV_machine ?= "b8dfdbe4d5a7b790bd2ecdb2889846e036469d25" +SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" 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.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" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "ce4e423e88244adab0deef2f9d021b2bf6d492ba" -SRCREV_machine ?= "cc09c000260f49e35e85a96853dd01404e6aa80a" -SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" +SRCREV_machine_qemuarm ?= "e6fb3720c9823cc706e8c6441cfd382b52bf7ae5" +SRCREV_machine ?= "57631093be11dd9606bbe8916b9f35bc9b6fe130" +SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" PV = "${LINUX_VERSION}+git${SRCPV}" 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" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "54d10cbfb44b9449f3962d962c6ec0d2e31017e8" -SRCREV_machine_qemuarm64 ?= "1048394a0538b9b282c1f36f4de7e4ab814c90bf" -SRCREV_machine_qemumips ?= "0214a416a56f01fed65e4b7818470139dc2b1286" -SRCREV_machine_qemuppc ?= "b678c6d8d47e6e67aefa985fea85fe3026f2c809" -SRCREV_machine_qemuriscv64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemuriscv32 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemux86 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemux86-64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemumips64 ?= "8d571427e05d1a8c7f7b0d32f291941429865ada" -SRCREV_machine ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" +SRCREV_machine_qemuarm ?= "778c2d4c9a4798b90ed3b5609ccbc2fa8b785778" +SRCREV_machine_qemuarm64 ?= "6c6e9a984aa0a6bb2a11528c27023c588064422d" +SRCREV_machine_qemumips ?= "3bcde31e0d5e48a2fd21f7d6300a7b5d625e5760" +SRCREV_machine_qemuppc ?= "20fb5e330325ade20c8c3c2de7a64d9994298af6" +SRCREV_machine_qemuriscv64 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemuriscv32 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemux86 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemux86-64 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemumips64 ?= "89e951f3655bd59f7564bd09c106186833702f12" +SRCREV_machine ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15"