Skip to content

Commit c2f75a4

Browse files
committed
objtool: Fix obsolete reference to CONFIG_X86_SMAP
CONFIG_X86_SMAP no longer exists. For objtool's purposes it has been replaced with CONFIG_HAVE_UACCESS_VALIDATION. Fixes: 03f16cd ("objtool: Add CONFIG_OBJTOOL") Reported-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Link: https://lore.kernel.org/r/44c57668768c1ba1b4ba1ff541ec54781636e07c.1654101721.git.jpoimboe@kernel.org
1 parent f2906aa commit c2f75a4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/Kconfig.ubsan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ config UBSAN_UNREACHABLE
9494
bool "Perform checking for unreachable code"
9595
# objtool already handles unreachable checking and gets angry about
9696
# seeing UBSan instrumentation located in unreachable places.
97-
depends on !(OBJTOOL && (STACK_VALIDATION || UNWINDER_ORC || X86_SMAP))
97+
depends on !(OBJTOOL && (STACK_VALIDATION || UNWINDER_ORC || HAVE_UACCESS_VALIDATION))
9898
depends on $(cc-option,-fsanitize=unreachable)
9999
help
100100
This option enables -fsanitize=unreachable which checks for control

0 commit comments

Comments
 (0)