From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/3] sandbox: fix link error when UBSAN is selected without ASAN
Date: Thu, 15 Oct 2020 11:00:54 +0200 [thread overview]
Message-ID: <20201015090055.31130-1-a.fatoum@pengutronix.de> (raw)
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>
---
arch/sandbox/Kconfig | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index bced81f25e9b..113b619fc35b 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
--
2.28.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2020-10-15 9:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 9:00 Ahmad Fatoum [this message]
2020-10-15 9:00 ` [PATCH 2/3] kbuild: force compiler to assume two's complement Ahmad Fatoum
2020-10-15 9:00 ` [PATCH 3/3] Revert "common: ubsan: ignore shifting one into sign bit" Ahmad Fatoum
2020-10-19 7:58 ` [PATCH 1/3] sandbox: fix link error when UBSAN is selected without ASAN Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201015090055.31130-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox