diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-10-06 15:04:28 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-07 10:18:55 +0100 |
commit | cdaf69b1d1963df559be8b4177e540f41a650220 (patch) | |
tree | bad4b9267ff03cf1393d4d4dfe7189498b2443d3 /meta/recipes-kernel/linux/linux-yocto_5.4.bb | |
parent | b534c8f338ac979811ecda192d52fbc18e371808 (diff) | |
download | poky-cdaf69b1d1963df559be8b4177e540f41a650220.tar.gz |
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
(From OE-Core rev: aa2b309a938f4af5f5d95bc7e7f3c0e9d77f3dd3)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_5.4.bb')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index d06d653d71..ad963bb5d1 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" | |||
12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" | 12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" |
13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" | 13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" |
14 | 14 | ||
15 | SRCREV_machine_qemuarm ?= "894e63d3256613faa39931a6ae505cfd196df067" | 15 | SRCREV_machine_qemuarm ?= "ea89b3a28f6a28c4c158ca3d64c2df4dd68321ed" |
16 | SRCREV_machine_qemuarm64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" | 16 | SRCREV_machine_qemuarm64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" |
17 | SRCREV_machine_qemumips ?= "aa13fdb2c5f8c4e4e432bfee6df9c8f76ec8ac70" | 17 | SRCREV_machine_qemumips ?= "d1f9cfb34040a4fc2d7a6827a27893aaa6b434e6" |
18 | SRCREV_machine_qemuppc ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" | 18 | SRCREV_machine_qemuppc ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" |
19 | SRCREV_machine_qemuriscv64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" | 19 | SRCREV_machine_qemuriscv64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" |
20 | SRCREV_machine_qemux86 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" | 20 | SRCREV_machine_qemux86 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" |
21 | SRCREV_machine_qemux86-64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" | 21 | SRCREV_machine_qemux86-64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" |
22 | SRCREV_machine_qemumips64 ?= "4fb21d604fc54db63221ea28ab90622c29d74202" | 22 | SRCREV_machine_qemumips64 ?= "362db79de010ca86e7e75fa468083ffbd6006e54" |
23 | SRCREV_machine ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" | 23 | SRCREV_machine ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a" |
24 | SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" | 24 | SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |