mm: disable CONFIG_MEMORY_HOTPLUG when KASAN is enabled
authorzhong jiang <zhongjiang@huawei.com>
Thu, 4 Aug 2016 22:31:44 +0000 (15:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2016 00:02:09 +0000 (20:02 -0400)
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>
mm/Kconfig

index c0837845c17c408a123d5864c1bec354ee074723..78a23c5c302d96ad6ef1198a02deb39a9a6bc228 100644 (file)
@@ -187,6 +187,7 @@ config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
        depends on SPARSEMEM || X86_64_ACPI_NUMA
        depends on ARCH_ENABLE_MEMORY_HOTPLUG
+       depends on !KASAN
 
 config MEMORY_HOTPLUG_SPARSE
        def_bool y