diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-10-15 11:00:54 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-19 09:58:15 +0200 |
| commit | df5840be03ca6f3ac1ef39afc47b5fed8e98b019 (patch) | |
| tree | 2109b65fa19abf95de8e69596983a91bde98f743 /arch/sandbox/Kconfig | |
| parent | bee1da7fcc005edab18fde60fd2ce956d12c5e18 (diff) | |
| download | barebox-df5840be03ca6f3ac1ef39afc47b5fed8e98b019.tar.gz barebox-df5840be03ca6f3ac1ef39afc47b5fed8e98b019.tar.xz | |
sandbox: fix link error when UBSAN is selected without ASAN
dc7f1fce6747 ("sandbox: fix SANDBOX_UNWIND dependency to be KASAN
only") already restricted ARCH_HAS_STACK_DUMP to be dependent
only on AddressSanitizer being available.
This change got lost by an erroneous merge conflict resolution in
39bdcdfb814a ("Merge branch 'for-next/misc' into master"). Fix it up.
Fixes: 39bdcdfb814a ("Merge branch 'for-next/misc' into master")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/sandbox/Kconfig')
| -rw-r--r-- | arch/sandbox/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index bced81f25e..113b619fc3 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -10,6 +10,7 @@ config SANDBOX select BLOCK select BLOCK_WRITE select PARTITION_DISK + select ARCH_HAS_STACK_DUMP if ASAN default y config ARCH_TEXT_BASE @@ -21,12 +22,6 @@ config LINUX default y select GENERIC_FIND_NEXT_BIT -config SANDBOX_UNWIND - bool - default y - select ARCH_HAS_STACK_DUMP - depends on UBSAN || ASAN - config SANDBOX_REEXEC prompt "exec(2) reset handler" def_bool y |