mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
Revert "ANDROID: GKI: fix ABI breakage in module.h"
This reverts commitdb96212bdeas it is not needed if we are able to update the Android KABI. Fixes:db96212bde("ANDROID: GKI: fix ABI breakage in module.h") Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ic6f4f449e554240457e1f94c49b53fa158f0d00e
This commit is contained in:
parent
a273b843ac
commit
d2a52d0eaa
2 changed files with 4 additions and 8 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue