From 3ade2c9958731789f7ec4ff4e71f1d058d041c5d Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Fri, 11 Feb 2022 18:25:37 +0100
Subject: [PATCH] BTF: Don't break ABI when debuginfo is disabled.

Patch-mainline: Never, SUSE-specific
References: jsc#SLE-18805

Disabling BTF removes a member from struct modinfo breaking ABI all over
the place. We expect that disabling debuginfo builds the same kernel but
with BTF disabling debuginfo also disables BTF causing this brekage.

Simply include the BTF member in struct modinfo always.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 include/linux/module.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 12d310f7c0fc..8e2ed15b5d24 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -470,7 +470,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
-- 
2.31.1