已开启
backport: update include headers for non-BTF #157
tkns_zhao创建于 6月26日
backport: update include headers for non-BTF #157
已开启
共 2 个文件变更+41-1
| @@ -0,0 +1,36 @@ | |||
| 1 | +From a01bb2bba5c3eb1cece41952cfc13a12321fbbc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: Aboorva Devarajan <aboorvad@linux.vnet.ibm.com> | ||
| 3 | +Date: Thu, 23 Nov 2023 23:15:04 -0600 | ||
| 4 | +Subject: [PATCH 068/148] tools/mdflush.bt: update include headers for non-BTF | ||
| 5 | + builds | ||
| 6 | + | ||
| 7 | +This commit updates the include headers in mdflush.bt to use | ||
| 8 | +<linux/blkdev.h> instead of <linux/genhd.h> for non-BTF builds. This | ||
| 9 | +change ensures proper compatibility to align with this Linux kernel | ||
| 10 | +commit 322cbb50de71 ("block: remove genhd.h") | ||
| 11 | + | ||
| 12 | +Reference to the Linux kernel commit (introduced from v5.18-rc1): | ||
| 13 | + | ||
| 14 | +https://github.com/torvalds/linux/commit/322cbb50de711814c42fb088f6d31901502c711a | ||
| 15 | + | ||
| 16 | +Signed-off-by: Aboorva Devarajan <aboorvad@linux.vnet.ibm.com> | ||
| 17 | +--- | ||
| 18 | + tools/mdflush.bt | 2 +- | ||
| 19 | + 1 files changed, 1 insertions(+), 1 deletion(-) | ||
| 20 | + | ||
| 21 | +diff --git a/tools/mdflush.bt b/tools/mdflush.bt | ||
| 22 | +index eb34b4cc..388658f2 100755 | ||
| 23 | +--- a/tools/mdflush.bt | ||
| 24 | ++++ b/tools/mdflush.bt | ||
| 25 | + | ||
| 26 | + */ | ||
| 27 | + | ||
| 28 | + #ifndef BPFTRACE_HAVE_BTF | ||
| 29 | +-#include <linux/genhd.h> | ||
| 30 | ++#include <linux/blkdev.h> | ||
| 31 | + #include <linux/bio.h> | ||
| 32 | + #endif | ||
| 33 | + | ||
| 34 | +-- | ||
| 35 | +2.33.0 | ||
| 36 | + | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | Name: bpftrace | 1 | Name: bpftrace |
| 2 | Version: 0.19.1 | 2 | Version: 0.19.1 |
| 3 | -Release: 59 | 3 | +Release: 60 |
| 4 | Summary: High-level tracing language for Linux eBPF | 4 | Summary: High-level tracing language for Linux eBPF |
| 5 | License: ASL 2.0 | 5 | License: ASL 2.0 |
| 6 | 6 | ||
| @@ -76,6 +76,7 @@ Patch0054: backport-ci-Install-optional-runtime-test-deps.patch | |||
| 76 | Patch0055: backport-ci-Add-static-build-job.patch | 76 | Patch0055: backport-ci-Add-static-build-job.patch |
| 77 | Patch0056: backport-Reduce-visual-noise-in-issue-templates.patch | 77 | Patch0056: backport-Reduce-visual-noise-in-issue-templates.patch |
| 78 | Patch0057: backport-Add-no-feature-option.patch | 78 | Patch0057: backport-Add-no-feature-option.patch |
| 79 | +Patch0058: backport-tools-mdflush.bt-update-include-headers-for-non-BTF-.patch | ||
| 79 | 80 | ||
| 80 | %description | 81 | %description |
| 81 | bpftrace is a high-level tracing language for Linux enhanced Berkeley Packet | 82 | bpftrace is a high-level tracing language for Linux enhanced Berkeley Packet |
| @@ -127,6 +128,9 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ | |||
| 127 | 128 | ||
| 128 | 129 | ||
| 129 | %changelog | 130 | %changelog |
| 131 | +* Fri Jun 26 2026 zhaoheqi <zhaoheqi@xfusion.com> - 0.19.1-60 | ||
| 132 | +- backport: update include headers for non-BTF | ||
| 133 | + | ||
| 130 | * Mon Jun 01 2026 gaoyongtao <gaoyongtao1@xfusion.com> - 0.19.1-59 | 134 | * Mon Jun 01 2026 gaoyongtao <gaoyongtao1@xfusion.com> - 0.19.1-59 |
| 131 | - backport: Add --no-feature option | 135 | - backport: Add --no-feature option |
| 132 | 136 | ||