From: Sasha Levin Date: Mon, 25 Mar 2024 13:52:48 +0000 (-0400) Subject: Drop libbpf-add-missed-btf_ext__raw_data-api.patch X-Git-Tag: v6.8.2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cadcdb0bc1064db0da62e1187beaf79d82b7bdbf;p=thirdparty%2Fkernel%2Fstable-queue.git Drop libbpf-add-missed-btf_ext__raw_data-api.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.8/libbpf-add-missed-btf_ext__raw_data-api.patch b/queue-6.8/libbpf-add-missed-btf_ext__raw_data-api.patch deleted file mode 100644 index 8cc93f76c00..00000000000 --- a/queue-6.8/libbpf-add-missed-btf_ext__raw_data-api.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 012492b32ad0e17dbd9c453c836cd31e3343c517 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 1 Feb 2024 09:20:26 -0800 -Subject: libbpf: Add missed btf_ext__raw_data() API - -From: Andrii Nakryiko - -[ Upstream commit b9551da8cf3ade01a50316df8a618fd945723ee0 ] - -Another API that was declared in libbpf.map but actual implementation -was missing. btf_ext__get_raw_data() was intended as a discouraged alias -to consistently-named btf_ext__raw_data(), so make this an actuality. - -Fixes: 20eccf29e297 ("libbpf: hide and discourage inconsistently named getters") -Signed-off-by: Andrii Nakryiko -Signed-off-by: Daniel Borkmann -Acked-by: Eduard Zingerman -Link: https://lore.kernel.org/bpf/20240201172027.604869-5-andrii@kernel.org -Signed-off-by: Sasha Levin ---- - tools/lib/bpf/btf.c | 6 +++++- - tools/lib/bpf/libbpf.map | 2 +- - tools/lib/bpf/linker.c | 2 +- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c -index b61bc5d1009b7..119d45eadb2ed 100644 ---- a/tools/lib/bpf/btf.c -+++ b/tools/lib/bpf/btf.c -@@ -3044,12 +3044,16 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size) - return btf_ext; - } - --const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size) -+const void *btf_ext__raw_data(const struct btf_ext *btf_ext, __u32 *size) - { - *size = btf_ext->data_size; - return btf_ext->data; - } - -+__attribute__((alias("btf_ext__raw_data"))) -+const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size); -+ -+ - struct btf_dedup; - - static struct btf_dedup *btf_dedup_new(struct btf *btf, const struct btf_dedup_opts *opts); -diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map -index 386964f572a8f..86804fd90dd1a 100644 ---- a/tools/lib/bpf/libbpf.map -+++ b/tools/lib/bpf/libbpf.map -@@ -325,7 +325,6 @@ LIBBPF_0.7.0 { - bpf_xdp_detach; - bpf_xdp_query; - bpf_xdp_query_id; -- btf_ext__raw_data; - libbpf_probe_bpf_helper; - libbpf_probe_bpf_map_type; - libbpf_probe_bpf_prog_type; -@@ -413,4 +412,5 @@ LIBBPF_1.4.0 { - global: - bpf_token_create; - btf__new_split; -+ btf_ext__raw_data; - } LIBBPF_1.3.0; -diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c -index 16bca56002ab3..0d4be829551b5 100644 ---- a/tools/lib/bpf/linker.c -+++ b/tools/lib/bpf/linker.c -@@ -2732,7 +2732,7 @@ static int finalize_btf(struct bpf_linker *linker) - - /* Emit .BTF.ext section */ - if (linker->btf_ext) { -- raw_data = btf_ext__get_raw_data(linker->btf_ext, &raw_sz); -+ raw_data = btf_ext__raw_data(linker->btf_ext, &raw_sz); - if (!raw_data) - return -ENOMEM; - --- -2.43.0 - diff --git a/queue-6.8/series b/queue-6.8/series index a0bedd2008d..c5278956998 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -116,7 +116,6 @@ arm64-dts-imx8mm-kontron-fix-interrupt-for-rtc-on-os.patch arm64-dts-imx8qm-align-edma3-power-domains-resources.patch arm64-dts-imx8qm-correct-edma3-power-domains-and-int.patch libbpf-add-missing-libbpf_api-annotation-to-libbpf_s.patch -libbpf-add-missed-btf_ext__raw_data-api.patch wifi-ath9k-delay-all-of-ath9k_wmi_event_tasklet-unti.patch wifi-ath11k-change-to-move-wmi_vdev_param_set_hemu_m.patch wifi-ath12k-fix-fetching-mcbc-flag-for-qcn9274.patch