]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
um: don't generate asm/bpf_perf_event.h
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 May 2024 17:13:55 +0000 (17:13 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 10 Jul 2024 12:23:30 +0000 (14:23 +0200)
If we start validating the existence of the asm-generic side of
generated headers, this one causes a warning:

make[3]: *** No rule to make target 'arch/um/include/generated/asm/bpf_perf_event.h', needed by 'all'.  Stop.

The problem is that the asm-generic header only exists for the uapi
variant, but arch/um has no uapi headers and instead uses the x86
userspace API.

Add a custom file with an explicit redirect to avoid this.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/um/include/asm/Kbuild
arch/um/include/asm/bpf_perf_event.h [new file with mode: 0644]

index 6fe34779291a86f288cd1d23fc460740d7797619..6c583040537cca507c6c579930ff75288b53e424 100644 (file)
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-generic-y += bpf_perf_event.h
 generic-y += bug.h
 generic-y += compat.h
 generic-y += current.h
diff --git a/arch/um/include/asm/bpf_perf_event.h b/arch/um/include/asm/bpf_perf_event.h
new file mode 100644 (file)
index 0000000..2872213
--- /dev/null
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+/*
+ * asm-generic/bpf_perf_event.h is part of the uapi headers, but since
+ * arch/um has no uapi of its on, we can't use the "generic-y"
+ * Kbuild rule to generate the wrapper
+ */
+
+#include <asm-generic/bpf_perf_event.h>