summaryrefslogtreecommitdiffstats
path: root/kernel/kallsyms.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-09 16:05:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-09 16:05:50 -0800
commit89a47dd1af8fdda667938ec190d9595d55d7ec6f (patch)
tree9d52cfbcfc49ee7b45ce530e7b9754a6380c0832 /kernel/kallsyms.c
parent380a129eb2c20d4b7b5be744e80e2ec18b24220b (diff)
parentf566e1fbadb686e28f1c307e356114b2865ef588 (diff)
downloadlinux-89a47dd1af8fdda667938ec190d9595d55d7ec6f.tar.gz
linux-89a47dd1af8fdda667938ec190d9595d55d7ec6f.tar.bz2
linux-89a47dd1af8fdda667938ec190d9595d55d7ec6f.zip
Merge tag 'kbuild-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada: - fix randconfig to generate a sane .config - rename hostprogs-y / always to hostprogs / always-y, which are more natual syntax. - optimize scripts/kallsyms - fix yes2modconfig and mod2yesconfig - make multiple directory targets ('make foo/ bar/') work * tag 'kbuild-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: make multiple directory targets work kconfig: Invalidate all symbols after changing to y or m. kallsyms: fix type of kallsyms_token_table[] scripts/kallsyms: change table to store (strcut sym_entry *) scripts/kallsyms: rename local variables in read_symbol() kbuild: rename hostprogs-y/always to hostprogs/always-y kbuild: fix the document to use extra-y for vmlinux.lds kconfig: fix broken dependency in randconfig-generated .config
Diffstat (limited to 'kernel/kallsyms.c')
-rw-r--r--kernel/kallsyms.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index d812b90f4c86..a9b3f660dee7 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -44,7 +44,7 @@ __attribute__((weak, section(".rodata")));
extern const unsigned long kallsyms_relative_base
__attribute__((weak, section(".rodata")));
-extern const u8 kallsyms_token_table[] __weak;
+extern const char kallsyms_token_table[] __weak;
extern const u16 kallsyms_token_index[] __weak;
extern const unsigned int kallsyms_markers[] __weak;
@@ -58,7 +58,8 @@ static unsigned int kallsyms_expand_symbol(unsigned int off,
char *result, size_t maxlen)
{
int len, skipped_first = 0;
- const u8 *tptr, *data;
+ const char *tptr;
+ const u8 *data;
/* Get the compressed symbol length from the first symbol byte. */
data = &kallsyms_names[off];