projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
mm
/
Kconfig
diff --git
a/mm/Kconfig
b/mm/Kconfig
index c0837845c17c408a123d5864c1bec354ee074723..78a23c5c302d96ad6ef1198a02deb39a9a6bc228 100644
(file)
--- a/
mm/Kconfig
+++ b/
mm/Kconfig
@@
-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