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.
Unified · Split
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | #ifndef __LINUX_INSTRUMENTATION_H | 2 | #ifndef __LINUX_INSTRUMENTATION_H |
| 3 | #define __LINUX_INSTRUMENTATION_H | 3 | #define __LINUX_INSTRUMENTATION_H |
| 4 | 4 | ||
| 5 | #ifdef CONFIG_VMLINUX_VALIDATION | 5 | #ifdef CONFIG_NOINSTR_VALIDATION |
| 6 | 6 | ||
| 7 | #include <linux/stringify.h> | 7 | #include <linux/stringify.h> |
| 8 | 8 | ||
| @@ -53,9 +53,9 @@ · 44 unmodified lines | |||
| 53 | ".popsection\n\t" : : "i" (c)); \ | 53 | ".popsection\n\t" : : "i" (c)); \ |
| 54 | }) | 54 | }) |
| 55 | #define instrumentation_end() __instrumentation_end(__COUNTER__) | 55 | #define instrumentation_end() __instrumentation_end(__COUNTER__) |
| 56 | #else /* !CONFIG_VMLINUX_VALIDATION */ | 56 | #else /* !CONFIG_NOINSTR_VALIDATION */ |
| 57 | # define instrumentation_begin() do { } while(0) | 57 | # define instrumentation_begin() do { } while(0) |
| 58 | # define instrumentation_end() do { } while(0) | 58 | # define instrumentation_end() do { } while(0) |
| 59 | #endif /* CONFIG_VMLINUX_VALIDATION */ | 59 | #endif /* CONFIG_NOINSTR_VALIDATION */ |
| 60 | 60 | ||
| 61 | #endif /* __LINUX_INSTRUMENTATION_H */ | 61 | #endif /* __LINUX_INSTRUMENTATION_H */ |
| @@ -500,7 +500,7 @@ config STACK_VALIDATION · 499 unmodified lines | |||
| 500 | For more information, see | 500 | For more information, see |
| 501 | tools/objtool/Documentation/stack-validation.txt. | 501 | tools/objtool/Documentation/stack-validation.txt. |
| 502 | 502 | ||
| 503 | config VMLINUX_VALIDATION | 503 | config NOINSTR_VALIDATION |
| 504 | bool | 504 | bool |
| 505 | depends on HAVE_OBJTOOL && DEBUG_ENTRY | 505 | depends on HAVE_OBJTOOL && DEBUG_ENTRY |
| 506 | select OBJTOOL | 506 | select OBJTOOL |
| @@ -160,7 +160,7 @@ objtool_link() · 159 unmodified lines | |||
| 160 | objtoolopt="${objtoolopt} --lto" | 160 | objtoolopt="${objtoolopt} --lto" |
| 161 | fi | 161 | fi |
| 162 | 162 | ||
| 163 | if is_enabled CONFIG_VMLINUX_VALIDATION; then | 163 | if is_enabled CONFIG_NOINSTR_VALIDATION; then |
| 164 | objtoolopt="${objtoolopt} --noinstr" | 164 | objtoolopt="${objtoolopt} --noinstr" |
| 165 | fi | 165 | fi |
| 166 | 166 | ||