[folded-merged] kasan-remove-redundant-config-option-v3.patch removed from -mm tree

[folded-merged] kasan-remove-redundant-config-option-v3.patch removed from -mm tree

[akpm]

The patch titled
     Subject: kasan-remove-redundant-config-option-v3
has been removed from the -mm tree.  Its filename was
     kasan-remove-redundant-config-option-v3.patch

This patch was dropped because it was folded into kasan-remove-redundant-config-option.patch

------------------------------------------------------
From: Walter Wu <walter-zh.wu@mediatek.com>
Subject: kasan-remove-redundant-config-option-v3

fix remaining the pre-processor syntax

Link: https://lkml.kernel.org/r/20210108040940.1138-1-walter-zh.wu@mediatek.com
Signed-off-by: Walter Wu <walter-zh.wu@mediatek.com>
Suggested-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Alexander Potapenko <glider@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 lib/Kconfig.kasan         |    3 +--
 mm/kasan/common.c         |    2 +-
 mm/kasan/report_generic.c |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

--- a/lib/Kconfig.kasan~kasan-remove-redundant-config-option-v3
+++ a/lib/Kconfig.kasan
@@ -139,10 +139,9 @@ config KASAN_INLINE
 endchoice
 
 config KASAN_STACK
-	bool "Enable stack instrumentation (unsafe)"
+	bool "Enable stack instrumentation (unsafe)" if CC_IS_CLANG && !COMPILE_TEST
 	depends on KASAN_GENERIC || KASAN_SW_TAGS
 	default y if CC_IS_GCC
-	default n if CC_IS_CLANG
 	help
 	  The LLVM stack address sanitizer has a know problem that
 	  causes excessive stack usage in a lot of functions, see
--- a/mm/kasan/common.c~kasan-remove-redundant-config-option-v3
+++ a/mm/kasan/common.c
@@ -63,7 +63,7 @@ void __kasan_unpoison_range(const void *
 	kasan_unpoison(address, size);
 }
 
-#if defined(CONFIG_KASAN_STACK)
+#ifdef CONFIG_KASAN_STACK
 /* Unpoison the entire stack for a task. */
 void kasan_unpoison_task_stack(struct task_struct *task)
 {
--- a/mm/kasan/report_generic.c~kasan-remove-redundant-config-option-v3
+++ a/mm/kasan/report_generic.c
@@ -128,7 +128,7 @@ void kasan_metadata_fetch_row(char *buff
 	memcpy(buffer, kasan_mem_to_shadow(row), META_BYTES_PER_ROW);
 }
 
-#if defined(CONFIG_KASAN_STACK)
+#ifdef CONFIG_KASAN_STACK
 static bool __must_check tokenize_frame_descr(const char **frame_descr,
 					      char *token, size_t max_tok_len,
 					      unsigned long *value)
_

Patches currently in -mm which might be from walter-zh.wu@mediatek.com are

kasan-remove-redundant-config-option.patch