diff options
| author | zhong jiang <zhongjiang@huawei.com> | 2016-08-04 18:31:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 20:02:09 -0400 |
| commit | 1e185736d21448f986ff338ce116e20260ffe03c (patch) | |
| tree | 49c2fa0cc487159119004f2dbb080c067eed0aca /mm | |
| parent | c1ece76719205690f4b448460d9b85c130e8021b (diff) | |
mm: disable CONFIG_MEMORY_HOTPLUG when KASAN is enabled
At present it is obvious that memory online and offline will fail when
KASAN is enabled. So add the condition to limit the memory_hotplug when
KASAN is enabled.
Link: http://lkml.kernel.org/r/1470063651-29519-1-git-send-email-zhongjiang@huawei.com
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index c0837845c17c..78a23c5c302d 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -187,6 +187,7 @@ config MEMORY_HOTPLUG | |||
| 187 | bool "Allow for memory hot-add" | 187 | bool "Allow for memory hot-add" |
| 188 | depends on SPARSEMEM || X86_64_ACPI_NUMA | 188 | depends on SPARSEMEM || X86_64_ACPI_NUMA |
| 189 | depends on ARCH_ENABLE_MEMORY_HOTPLUG | 189 | depends on ARCH_ENABLE_MEMORY_HOTPLUG |
| 190 | depends on !KASAN | ||
| 190 | 191 | ||
| 191 | config MEMORY_HOTPLUG_SPARSE | 192 | config MEMORY_HOTPLUG_SPARSE |
| 192 | def_bool y | 193 | def_bool y |