From f1a7e3f166a2d55b2706f53acb4820a1f8ce221f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 19 Nov 2020 14:17:49 -0500 Subject: linux-yocto/5.4: 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.4: 356914747645 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 (cherry picked from commit 73ee256e5c1194ec5d0843dee274d29cc0efe993) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/recipes-kernel/linux/linux-yocto_5.4.bb') diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index edd5de6c40..e049d21689 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" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "dbac8d2939bca0a92226cfd55543331715dd642d" -SRCREV_machine_qemuarm64 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" -SRCREV_machine_qemumips ?= "819cf265755f21768f6bb98312cb568c6db8b1e8" -SRCREV_machine_qemuppc ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" -SRCREV_machine_qemuriscv64 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" -SRCREV_machine_qemux86 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" -SRCREV_machine_qemux86-64 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" -SRCREV_machine_qemumips64 ?= "bb9110d96ce8a2c56466e5b4314b93175af3d80d" -SRCREV_machine ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" +SRCREV_machine_qemuarm ?= "879db1ae1856cf5a9fe4609fdbcbe2e3c7bade5f" +SRCREV_machine_qemuarm64 ?= "356914747645db5ceba98b22acdfa060ef1764af" +SRCREV_machine_qemumips ?= "190c3ce9c2dbc709c3dcf02d8cfa80adc8a063d2" +SRCREV_machine_qemuppc ?= "356914747645db5ceba98b22acdfa060ef1764af" +SRCREV_machine_qemuriscv64 ?= "356914747645db5ceba98b22acdfa060ef1764af" +SRCREV_machine_qemux86 ?= "356914747645db5ceba98b22acdfa060ef1764af" +SRCREV_machine_qemux86-64 ?= "356914747645db5ceba98b22acdfa060ef1764af" +SRCREV_machine_qemumips64 ?= "98b1fc2eafc28e5c198e23579e38a76626c66182" +SRCREV_machine ?= "356914747645db5ceba98b22acdfa060ef1764af" SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" # remap qemuarm to qemuarma15 for the 5.4 kernel -- cgit 1.2.3-korg