kernel/kallsyms.c: replace all_var with IS_ENABLED(CONFIG_KALLSYMS_ALL)
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 10 Jul 2017 22:51:20 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jul 2017 23:32:34 +0000 (16:32 -0700)
'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>
kernel/kallsyms.c

index 6a3b249a2ae107b04a044f8b4760f3b55591cb43..127e7cfafa55207a3fb45e5dc158c7885b949b49 100644 (file)
 
 #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
  * during the second link stage.
 /*
  * These will be re-linked against their real values
  * 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_text(addr) || is_kernel_inittext(addr);
                return is_kernel(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 (is_kernel_inittext(addr))
                        symbol_end = (unsigned long)_einittext;
        if (!symbol_end) {
                if (is_kernel_inittext(addr))
                        symbol_end = (unsigned long)_einittext;
-               else if (all_var)
+               else if (IS_ENABLED(CONFIG_KALLSYMS_ALL))
                        symbol_end = (unsigned long)_end;
                else
                        symbol_end = (unsigned long)_etext;
                        symbol_end = (unsigned long)_end;
                else
                        symbol_end = (unsigned long)_etext;