diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 16:23:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 16:23:01 -0700 |
| commit | 67463e54beb63114965c3d2c7cb81d1d524e2697 (patch) | |
| tree | 736e56a9d5d8ebfa21e46a99a3242abc5db3f413 /mm/Kconfig | |
| parent | 9db4f36e82c2394c958d8e42a498fb664684bc22 (diff) | |
| download | linux-stable-67463e54beb63114965c3d2c7cb81d1d524e2697.tar.gz linux-stable-67463e54beb63114965c3d2c7cb81d1d524e2697.tar.bz2 linux-stable-67463e54beb63114965c3d2c7cb81d1d524e2697.zip | |
Allow KASAN and HOTPLUG_MEMORY to co-exist when doing build testing
No, KASAN may not be able to co-exist with HOTPLUG_MEMORY at runtime,
but for build testing there is no reason not to allow them together.
This hopefully means better build coverage and fewer embarrasing silly
problems like the one fixed by commit 9db4f36e82c2 ("mm: remove unused
variable in memory hotplug") in the future.
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index be0ee11fa0d9..86e3e0e74d20 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -187,7 +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 + depends on COMPILE_TEST || !KASAN config MEMORY_HOTPLUG_SPARSE def_bool y |