objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"

CONFIG_VMLINUX_VALIDATION is just the validation of the "noinstr" rules.
That name is a misnomer, because now objtool actually does vmlinux
validation for other reasons.

Rename CONFIG_VMLINUX_VALIDATION to CONFIG_NOINSTR_VALIDATION.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/173f07e2d6d1afc0874aed975a61783207c6a531.1650300597.git.jpoimboe@redhat.com

diff --git a/include/linux/instrumentation.h b/include/linux/instrumentation.h
index 9111a370407263064ce1cb6f5b5a0818856ca80c..bc7babe91b2e6492073b82d5c013c687e6ccca0b 100644 (file)
--- a/include/linux/instrumentation.h
+++ b/include/linux/instrumentation.h
@@ -2,7 +2,7 @@
 #ifndef __LINUX_INSTRUMENTATION_H
 #define __LINUX_INSTRUMENTATION_H
 
-#ifdef CONFIG_VMLINUX_VALIDATION
+#ifdef CONFIG_NOINSTR_VALIDATION
 
 #include <linux/stringify.h>
 
@@ -53,9 +53,9 @@
                     ".popsection\n\t" : : "i" (c));                    \
 })
 #define instrumentation_end() __instrumentation_end(__COUNTER__)
-#else /* !CONFIG_VMLINUX_VALIDATION */
+#else /* !CONFIG_NOINSTR_VALIDATION */
 # define instrumentation_begin()       do { } while(0)
 # define instrumentation_end()         do { } while(0)
-#endif /* CONFIG_VMLINUX_VALIDATION */
+#endif /* CONFIG_NOINSTR_VALIDATION */
 
 #endif /* __LINUX_INSTRUMENTATION_H */

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7d2bbc3e558e712cb770148a5205a931b3269d29..73359d6cd9a24261a0915fa72f0da825b915923f 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -500,7 +500,7 @@ config STACK_VALIDATION
          For more information, see
          tools/objtool/Documentation/stack-validation.txt.
 
-config VMLINUX_VALIDATION
+config NOINSTR_VALIDATION
        bool
        depends on HAVE_OBJTOOL && DEBUG_ENTRY
        select OBJTOOL

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 90c9c4c05d95caf0991487d23014915a5ff533a5..fce4f41816cdb30cabf6f4c60daac82b5d7d0c26 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -160,7 +160,7 @@ objtool_link()
                objtoolopt="${objtoolopt} --lto"
        fi
 
-       if is_enabled CONFIG_VMLINUX_VALIDATION; then
+       if is_enabled CONFIG_NOINSTR_VALIDATION; then
                objtoolopt="${objtoolopt} --noinstr"
        fi