aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-06-23 11:37:44 -0400
committerJessica Yu <jeyu@kernel.org>2018-06-25 05:18:29 -0400
commit996302c5e85650722f1e5aeaeaaac12f9f362bf8 (patch)
tree05dcdf78271b69f9459fa1f5d37955d60f56f648 /kernel
parent62267e0ecc9c00a1b8ff7859cfa03e34b419f7ee (diff)
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 'kernel')
-rw-r--r--kernel/module.c6
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,
1341 * locking is necessary -- use preempt_disable() to placate lockdep. 1341 * locking is necessary -- use preempt_disable() to placate lockdep.
1342 */ 1342 */
1343 preempt_disable(); 1343 preempt_disable();
1344 if (!find_symbol(VMLINUX_SYMBOL_STR(module_layout), NULL, 1344 if (!find_symbol("module_layout", NULL, &crc, true, false)) {
1345 &crc, true, false)) {
1346 preempt_enable(); 1345 preempt_enable();
1347 BUG(); 1346 BUG();
1348 } 1347 }
1349 preempt_enable(); 1348 preempt_enable();
1350 return check_version(info, VMLINUX_SYMBOL_STR(module_layout), 1349 return check_version(info, "module_layout", mod, crc);
1351 mod, crc);
1352} 1350}
1353 1351
1354/* First part is kernel version, which we ignore if module has crcs. */ 1352/* First part is kernel version, which we ignore if module has crcs. */