Disable KSM to allow watchdog stop in time

163c0a37 · Tomi Sarvela · 5f9d4600 · 163c0a37 · 163c0a37 · 163c0a37
Commit 163c0a37 authored Apr 23, 2020 by Tomi Sarvela
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

kconfig/debug kconfig/debug +1 -1

kconfig/debug-gcov kconfig/debug-gcov +1 -1

kconfig/debug-kasan kconfig/debug-kasan +1 -1

No files found.
--- a/kconfig/debug
+++ b/kconfig/debug
@@ -785,7 +785,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
+CONFIG_KSM=n
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set

--- a/kconfig/debug-gcov
+++ b/kconfig/debug-gcov
@@ -788,7 +788,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
+CONFIG_KSM=n
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set

--- a/kconfig/debug-kasan
+++ b/kconfig/debug-kasan
@@ -782,7 +782,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
+CONFIG_KSM=n
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set