Commit 0f620cef authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

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: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/173f07e2d6d1afc0874aed975a61783207c6a531.1650300597.git.jpoimboe@redhat.com
parent 22102f45

include/linux/instrumentation.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */

lib/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/link-vmlinux.sh

+1 −1
Original line number Diff line number Diff line
@@ -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