openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

kernel/kallsyms.c: replace all_var with IS_ENABLED(CONFIG_KALLSYMS_ALL) 

'all_var' looks like a variable, but is actually a macro.  Use
IS_ENABLED(CONFIG_KALLSYMS_ALL) for clarification.

Link: http://lkml.kernel.org/r/1497577591-3434-1-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Masahiro Yamada 2017-07-10 15:51:20 -07:00 committed by Linus Torvalds
parent b7b2562f72
commit 63b23e2cbc
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/kallsyms.c
View File

@ -28,12 +28,6 @@
#include <asm/sections.h> #include <asm/sections.h>
#ifdef CONFIG_KALLSYMS_ALL
#define all_var 1
#else
#define all_var 0
#endif
/* /*
* These will be re-linked against their real values * These will be re-linked against their real values
* during the second link stage. * during the second link stage.
@ -82,7 +76,7 @@ static inline int is_kernel(unsigned long addr)
static int is_ksym_addr(unsigned long addr) static int is_ksym_addr(unsigned long addr)
{ {
if (all_var) if (IS_ENABLED(CONFIG_KALLSYMS_ALL))
return is_kernel(addr); return is_kernel(addr);
return is_kernel_text(addr) || is_kernel_inittext(addr); return is_kernel_text(addr) || is_kernel_inittext(addr);
@ -280,7 +274,7 @@ static unsigned long get_symbol_pos(unsigned long addr,
if (!symbol_end) { if (!symbol_end) {
if (is_kernel_inittext(addr)) if (is_kernel_inittext(addr))
symbol_end = (unsigned long)_einittext; symbol_end = (unsigned long)_einittext;
else if (all_var) else if (IS_ENABLED(CONFIG_KALLSYMS_ALL))
symbol_end = (unsigned long)_end; symbol_end = (unsigned long)_end;
else else
symbol_end = (unsigned long)_etext; symbol_end = (unsigned long)_etext;