From: calm329 <calmdev0329@gmail.com>
Date: Mon, 12 Jan 2026 18:20:22 +0000 (-0800)
Subject: basic: move BPF_JMP_A to override/linux/bpf_insn.h
X-Git-Tag: v260-rc1~409
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac2b5f6cbf24455fb1827f6001b286aeef0a2660;p=thirdparty%2Fsystemd.git

basic: move BPF_JMP_A to override/linux/bpf_insn.h

Move the BPF_JMP_A macro from override/linux/bpf.h to
override/linux/bpf_insn.h. The bpf.h override conflicts with libbpf's
-I/usr/include/bpf/uapi include path. Since bpf_insn.h is not typically
installed at /usr/include/linux/ or /usr/include/bpf/uapi/linux/, the
override works without conflicts.

Fixes #40331
---

diff --git a/src/include/override/linux/bpf.h b/src/include/override/linux/bpf_insn.h
similarity index 89%
rename from src/include/override/linux/bpf.h
rename to src/include/override/linux/bpf_insn.h
index f33c748fde2..501af526700 100644
--- a/src/include/override/linux/bpf.h
+++ b/src/include/override/linux/bpf_insn.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include_next <linux/bpf.h>     /* IWYU pragma: export */
+#include_next <linux/bpf_insn.h>     /* IWYU pragma: export */
 
 /* defined in linux/filter.h */
 /* Unconditional jumps, goto pc + off16 */