From 4fc9e431d19fba76d604f05afd8b9f478d30f462 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 27 Jun 2020 00:13:56 -0500 Subject: meta-raspberrypi: subtree update:39cf54c3cb..a6f1233d52 Jon Magnuson (1): packagegroup-rpi-test: resolve `wireless-regdb` conflict Khem Raj (1): linux-raspberrypi_5.4.bb: Upgrade to 5.4.47 Leon Anavi (7): lirc_%.bbappend: Fix for gpio-ir lirc: Move to dynamic-layers rpi-config: Add ENABLE_IR variable for infrared rpi-base.inc: Include modules if IR is enabled lirc_%.bbappend: Use lircd.service as in Raspbian docs/extra-build-config.md: Infrared lirc: Rename bbappend to match only version 0.10.1 M. ter Woord (1): Update layer-contents.md to include pi4 Signed-off-by: Andrew Geissler Change-Id: I6f20c20dec1dd2fdab9e4e52dea1cdd54be4fffc --- ...t-selftests-bpf-Skip-perf-hw-events-test-if-the.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'meta-raspberrypi/recipes-kernel/linux/files') diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch index 59183dc30..66efde138 100644 --- a/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch +++ b/meta-raspberrypi/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 -- cgit v1.2.3