Merge branch 'master'

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 5ecc2cf3e1d7..320dda1778c3 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1840,7 +1840,7 @@ asmlinkage long sys_munmap(unsigned long addr, size_t len)
 
 static inline void verify_mm_writelocked(struct mm_struct *mm)
 {
-#ifdef CONFIG_DEBUG_KERNEL
+#ifdef CONFIG_DEBUG_VM
         if (unlikely(down_read_trylock(&mm->mmap_sem))) {
                 WARN_ON(1);
                 up_read(&mm->mmap_sem);