mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix

little fixes, per David

Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/Documentation/kasan.txt b/Documentation/kasan.txt
index 310746718f21e4efb63db3e1432640edb6dd8ce1..aa1e0c91e368885ba90e152abd377ce18dd4bdc3 100644 (file)
--- a/Documentation/kasan.txt
+++ b/Documentation/kasan.txt
@@ -28,7 +28,7 @@ the latter is 1.1 - 2 times faster. Inline instrumentation requires a GCC
 version 5.0 or later.
 
 Currently KASAN works only with the SLUB memory allocator.
-For better bug detection and nicer report and enable CONFIG_STACKTRACE.
+For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.
 
 To disable instrumentation for specific files or directories, add a line
 similar to the following to the respective kernel Makefile:

diff --git a/mm/slub.c b/mm/slub.c
index e7b486f182bd1d42cb4ddc5151a7d843a5dd6384..6f0dda19db2a43169c6b98187469327f9d746d5d 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -459,7 +459,7 @@ static void get_map(struct kmem_cache *s, struct page *page, unsigned long *map)
 /*
  * Debug settings:
  */
-#ifdef CONFIG_SLUB_DEBUG_ON
+#if defined(CONFIG_SLUB_DEBUG_ON)
 static int slub_debug = DEBUG_DEFAULT_FLAGS;
 #elif defined(CONFIG_KASAN)
 static int slub_debug = SLAB_STORE_USER;