diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
commit | 16e0e6a83b778284ae9b3a57003eeea8d8090b55 (patch) | |
tree | 42bf9a711c59549294b2f2125978f5a7095e16c2 /lib | |
parent | 25a00ac7dc92912f0b1e5e533bf077255c828b02 (diff) | |
parent | ce03b6d2b610b70bb527d14d82c2394adb235e5d (diff) | |
download | linux-16e0e6a83b778284ae9b3a57003eeea8d8090b55.tar.bz2 |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig.kasan | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index c253c1b46c6b..befb127507c0 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -5,7 +5,7 @@ if HAVE_ARCH_KASAN config KASAN bool "KASan: runtime memory debugger" - depends on SLUB || (SLAB && !DEBUG_SLAB) + depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) select SLUB_DEBUG if SLUB select CONSTRUCTORS select STACKDEPOT |