From 4851a5509805656b551ae304f3e2021cdd375cd0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 18 Jun 2020 13:50:46 -0700 Subject: linux-raspberrypi_5.4.bb: Upgrade to 5.4.47 Drop backported patches which are already in this release Fixes Issue #658 Signed-off-by: Khem Raj --- ...t-selftests-bpf-Skip-perf-hw-events-test-if-the.patch | 16 +++++++++------- recipes-kernel/linux/linux-raspberrypi_5.4.bb | 8 +++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch b/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch index 59183dc..66efde1 100644 --- a/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch +++ b/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch @@ -1,16 +1,18 @@ -From a7783676c60dd90a6f4c26bcb9be03dc5703b74e Mon Sep 17 00:00:00 2001 +From 754e3030788702c1f013a88a4fc8546742d84e27 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Mon, 13 Apr 2020 11:25:32 -0700 -Subject: [PATCH 1/2] Revert "selftests/bpf: Skip perf hw events test if the - setup disabled it" +Date: Thu, 18 Jun 2020 13:45:04 -0700 +Subject: [PATCH] Revert "selftests/bpf: Skip perf hw events test if the setup + disabled it" This reverts commit da43712a7262891317883d4b3a909fb18dac4b1d. + +Signed-off-by: Khem Raj --- .../selftests/bpf/prog_tests/stacktrace_build_id_nmi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c -index 1735faf17536..f62aa0eb959b 100644 +index 437cb93e72ac..f62aa0eb959b 100644 --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c @@ -49,12 +49,8 @@ void test_stacktrace_build_id_nmi(void) @@ -20,7 +22,7 @@ index 1735faf17536..f62aa0eb959b 100644 - if (pmu_fd < 0 && errno == ENOENT) { - printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__); - test__skip(); -- goto cleanup; +- goto close_prog; - } - if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n", + if (CHECK(pmu_fd < 0, "perf_event_open", @@ -29,5 +31,5 @@ index 1735faf17536..f62aa0eb959b 100644 goto close_prog; -- -2.26.0 +2.27.0 diff --git a/recipes-kernel/linux/linux-raspberrypi_5.4.bb b/recipes-kernel/linux/linux-raspberrypi_5.4.bb index b1881a2..aaf228e 100644 --- a/recipes-kernel/linux/linux-raspberrypi_5.4.bb +++ b/recipes-kernel/linux/linux-raspberrypi_5.4.bb @@ -1,13 +1,11 @@ -LINUX_VERSION ?= "5.4.45" +LINUX_VERSION ?= "5.4.47" LINUX_RPI_BRANCH ?= "rpi-5.4.y" -SRCREV = "d00cdd80abb2a8c201cae2f6bd80e27eb2f7d347" +SRCREV = "dec0ddc506ab5d93a7de4b8a7c8dc98e0a96f85c" require linux-raspberrypi_5.4.inc -SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ - file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \ +SRC_URI += "file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \ file://0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch \ - file://0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch \ file://powersave.cfg \ " -- cgit v1.2.3-54-g00ecf