From: Ben Hutchings <benh@debian.org>
Date: Fri, 13 May 2022 19:08:08 +0000 (+0200)
Subject: module: Avoid ABI changes when debug info is disabled
X-Git-Tag: archive/raspbian/6.1.140-1+rpi1^2~124
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e84af97649f017c3cb4def114553903ff3dd64ec;p=linux.git

module: Avoid ABI changes when debug info is disabled

Forwarded: not-needed

CI builds are done with debug info disabled, but this removes some
members from struct module.  This causes builds to fail if there is an
ABI reference for the current ABI.

Define these members unconditionally, so that there is no ABI change.


Gbp-Pq: Topic debian
Gbp-Pq: Name module-avoid-abi-changes-when-debug-info-is-disabled.patch
---

diff --git a/include/linux/module.h b/include/linux/module.h
index 41c4c472ed1..ba137b237c7 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -473,7 +473,7 @@ struct module {
 	unsigned int num_bpf_raw_events;
 	struct bpf_raw_event_map *bpf_raw_events;
 #endif
-#ifdef CONFIG_DEBUG_INFO_BTF_MODULES
+#if 1
 	unsigned int btf_data_size;
 	void *btf_data;
 #endif