From 350e5bdf0bb79750452bb57c1aba7e0b343c2634 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 6 Oct 2020 15:04:28 -0400 Subject: linux-yocto/5.4: fix kprobes build warning Integrating the following commit(s) to linux-yocto/5.4: 178189d65780 kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit aa2b309a938f4af5f5d95bc7e7f3c0e9d77f3dd3) 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 88a582dd4e..ce6188ca6a 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 ?= "894e63d3256613faa39931a6ae505cfd196df067" -SRCREV_machine_qemuarm64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemumips ?= "aa13fdb2c5f8c4e4e432bfee6df9c8f76ec8ac70" -SRCREV_machine_qemuppc ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemuriscv64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemux86 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemux86-64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" -SRCREV_machine_qemumips64 ?= "4fb21d604fc54db63221ea28ab90622c29d74202" -SRCREV_machine ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" +SRCREV_machine_qemuarm ?= "ea89b3a28f6a28c4c158ca3d64c2df4dd68321ed" +SRCREV_machine_qemuarm64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" +SRCREV_machine_qemumips ?= "d1f9cfb34040a4fc2d7a6827a27893aaa6b434e6" +SRCREV_machine_qemuppc ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" +SRCREV_machine_qemuriscv64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" +SRCREV_machine_qemux86 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" +SRCREV_machine_qemux86-64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" +SRCREV_machine_qemumips64 ?= "362db79de010ca86e7e75fa468083ffbd6006e54" +SRCREV_machine ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" # remap qemuarm to qemuarma15 for the 5.4 kernel -- cgit 1.2.3-korg