From 41135c844af1165b1e74e8e2654784f3cd4def8b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 19 Nov 2020 14:17:50 -0500 Subject: linux-yocto/5.8: perf: Alias SYS_futex with SYS_futex_time64 on 32-bit arches with 64bit time_t Integrating the following commit(s) to linux-yocto/5.8: 52b840afae05 perf: Alias SYS_futex with SYS_futex_time64 on 32-bit arches with 64bit time_t Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.8.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb index 203ddf6684..c2d627acb7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" +SRCREV_machine ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb index f37f525cc3..31a84f3972 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "aa614dcf182db126013b255968ab125afd96eb88" -SRCREV_machine ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" +SRCREV_machine_qemuarm ?= "3e9aa72b02cf7d04096e367c99d503cd1d26cc6c" +SRCREV_machine ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/meta/recipes-kernel/linux/linux-yocto_5.8.bb index c0cdffce73..c6fb9e9f86 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.8.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.8/standard/base" KBRANCH_qemux86-64 ?= "v5.8/standard/base" KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "cd6c8c74317d2f9504c25e28e37f4140deec2d19" -SRCREV_machine_qemuarm64 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" -SRCREV_machine_qemumips ?= "c610a204d0821f5abc253e72894fd32b41b92db3" -SRCREV_machine_qemuppc ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" -SRCREV_machine_qemuriscv64 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" -SRCREV_machine_qemux86 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" -SRCREV_machine_qemux86-64 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" -SRCREV_machine_qemumips64 ?= "86cc0d9a3f6751ada12fa4630b3e3c23221d6da7" -SRCREV_machine ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" +SRCREV_machine_qemuarm ?= "0c6d276c75233f9b8d05103ff652676a2c271868" +SRCREV_machine_qemuarm64 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" +SRCREV_machine_qemumips ?= "4c07d59936f8e28eadecab8f56ef14726f77ccb8" +SRCREV_machine_qemuppc ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" +SRCREV_machine_qemuriscv64 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" +SRCREV_machine_qemux86 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" +SRCREV_machine_qemux86-64 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" +SRCREV_machine_qemumips64 ?= "2224bf83cf372bb729583dfb93ad28abba9905fd" +SRCREV_machine ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a" SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" # remap qemuarm to qemuarma15 for the 5.8 kernel -- cgit 1.2.3-korg