diff --git a/include/linux/module.h b/include/linux/module.h index 5246cbce5881..4f71785d6bbd 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -346,11 +346,6 @@ struct klp_modinfo { }; #endif -struct module_kabi_preserve_1 { - u64 using_gplonly_symbols:1; - u64 free:63; -}; - struct module { enum module_state state; @@ -387,6 +382,7 @@ struct module { unsigned int num_gpl_syms; const struct kernel_symbol *gpl_syms; const s32 *gpl_crcs; + bool using_gplonly_symbols; #ifdef CONFIG_UNUSED_SYMBOLS /* unused exported symbols. */ @@ -520,7 +516,7 @@ struct module { struct error_injection_entry *ei_funcs; unsigned int num_ei_funcs; #endif - ANDROID_KABI_USE(1, struct module_kabi_preserve_1 m1); + ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(2); ANDROID_KABI_RESERVE(3); ANDROID_KABI_RESERVE(4); diff --git a/kernel/module.c b/kernel/module.c index 36e15ead5a80..901a6e4158af 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1432,7 +1432,7 @@ static bool inherit_taint(struct module *mod, struct module *owner) if (!owner || !test_bit(TAINT_PROPRIETARY_MODULE, &owner->taints)) return true; - if (mod->m1.using_gplonly_symbols) { + if (mod->using_gplonly_symbols) { pr_err("%s: module using GPL-only symbols uses symbols from proprietary module %s.\n", mod->name, owner->name); return false; @@ -1471,7 +1471,7 @@ static const struct kernel_symbol *resolve_symbol(struct module *mod, goto unlock; if (license == GPL_ONLY) - mod->m1.using_gplonly_symbols = true; + mod->using_gplonly_symbols = true; if (!inherit_taint(mod, owner)) { sym = NULL;