diff options
| author |   Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-06-24 00:37:44 +0900 |
|---|---|---|
| committer |   Jessica Yu <jeyu@kernel.org> | 2018-06-25 11:18:29 +0200 |
| commit | 996302c5e85650722f1e5aeaeaaac12f9f362bf8 (patch) | |
| tree | 05dcdf78271b69f9459fa1f5d37955d60f56f648 /kernel/module.c | |
| parent | module: print sensible error code (diff) | |
| download | linux-dev-996302c5e85650722f1e5aeaeaaac12f9f362bf8.tar.xz linux-dev-996302c5e85650722f1e5aeaeaaac12f9f362bf8.zip | |
module: replace VMLINUX_SYMBOL_STR() with __stringify() or string literal
With the special case handling for Blackfin and Metag was removed by
commit 94e58e0ac312 ("export.h: remove code for prefixing symbols with
underscore"), VMLINUX_SYMBOL_STR() is now equivalent to __stringify().
Replace the remaining usages to prepare for the entire removal of
VMLINUX_SYMBOL_STR().
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/module.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/module.c b/kernel/module.c index b6b3a3c58af1..ba45a84e4287 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1341,14 +1341,12 @@ static inline int check_modstruct_version(const struct load_info *info, * locking is necessary -- use preempt_disable() to placate lockdep. */ preempt_disable(); - if (!find_symbol(VMLINUX_SYMBOL_STR(module_layout), NULL, - &crc, true, false)) { + if (!find_symbol("module_layout", NULL, &crc, true, false)) { preempt_enable(); BUG(); } preempt_enable(); - return check_version(info, VMLINUX_SYMBOL_STR(module_layout), - mod, crc); + return check_version(info, "module_layout", mod, crc); } /* First part is kernel version, which we ignore if module has crcs. */ |