The patch titled
Subject: buildid: fix build when CONFIG_MODULES is not set
has been removed from the -mm tree. Its filename was
module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix-2.patch
This patch was dropped because it was folded into module-add-printk-formats-to-add-module-build-id-to-stacktraces.patch
------------------------------------------------------
From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Subject: buildid: fix build when CONFIG_MODULES is not set
Omit the static_assert() when CONFIG_MODULES is not set/enabled.
Fixes these build errors:
../kernel/kallsyms.c: In function `__sprint_symbol':
../include/linux/kernel.h:53:43: error: dereferencing pointer to incomplete type `struct module'
#define typeof_member(T, m) typeof(((T*)0)->m)
^
../include/linux/build_bug.h:78:41: error: static assertion failed: "sizeof(typeof_member(struct module, build_id)) == 20"
#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
^
../kernel/kallsyms.c:454:4: note: in expansion of macro `static_assert'
static_assert(sizeof(typeof_member(struct module, build_id)) == 20);
^~~~~~~~~~~~~
Link: https://lkml.kernel.org/r/20210513171510.20328-1-rdunlap@xxxxxxxxxxxxx
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/kallsyms.c | 2 ++
1 file changed, 2 insertions(+)
--- a/kernel/kallsyms.c~module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix-2
+++ a/kernel/kallsyms.c
@@ -451,7 +451,9 @@ static int __sprint_symbol(char *buffer,
#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID)
if (add_buildid && buildid) {
/* build ID should match length of sprintf */
+#if IS_ENABLED(CONFIG_MODULES)
static_assert(sizeof(typeof_member(struct module, build_id)) == 20);
+#endif
len += sprintf(buffer + len, " %20phN", buildid);
}
#endif
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are
module-add-printk-formats-to-add-module-build-id-to-stacktraces.patch
