Skip to content

Commit 0f620ce

Browse files
jpoimboePeter Zijlstra
authored andcommitted
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 <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Miroslav Benes <[email protected]> Link: https://lkml.kernel.org/r/173f07e2d6d1afc0874aed975a61783207c6a531.1650300597.git.jpoimboe@redhat.com
1 parent 22102f4 commit 0f620ce

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

include/linux/instrumentation.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef __LINUX_INSTRUMENTATION_H
33
#define __LINUX_INSTRUMENTATION_H
44

5-
#ifdef CONFIG_VMLINUX_VALIDATION
5+
#ifdef CONFIG_NOINSTR_VALIDATION
66

77
#include <linux/stringify.h>
88

@@ -53,9 +53,9 @@
5353
".popsection\n\t" : : "i" (c)); \
5454
})
5555
#define instrumentation_end() __instrumentation_end(__COUNTER__)
56-
#else /* !CONFIG_VMLINUX_VALIDATION */
56+
#else /* !CONFIG_NOINSTR_VALIDATION */
5757
# define instrumentation_begin() do { } while(0)
5858
# define instrumentation_end() do { } while(0)
59-
#endif /* CONFIG_VMLINUX_VALIDATION */
59+
#endif /* CONFIG_NOINSTR_VALIDATION */
6060

6161
#endif /* __LINUX_INSTRUMENTATION_H */

lib/Kconfig.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ config STACK_VALIDATION
500500
For more information, see
501501
tools/objtool/Documentation/stack-validation.txt.
502502

503-
config VMLINUX_VALIDATION
503+
config NOINSTR_VALIDATION
504504
bool
505505
depends on HAVE_OBJTOOL && DEBUG_ENTRY
506506
select OBJTOOL

scripts/link-vmlinux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ objtool_link()
160160
objtoolopt="${objtoolopt} --lto"
161161
fi
162162

163-
if is_enabled CONFIG_VMLINUX_VALIDATION; then
163+
if is_enabled CONFIG_NOINSTR_VALIDATION; then
164164
objtoolopt="${objtoolopt} --noinstr"
165165
fi
166166

0 commit comments

Comments
 (0)