Merge branch 'devel-stable' into devel

1 files changed, 7 insertions, 0 deletions

diff --git a/mm/highmem.c b/mm/highmem.c
index 66baa20f78f5..7a0aa1be4993 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -26,6 +26,7 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/highmem.h>
+#include <linux/kgdb.h>
 #include <asm/tlbflush.h>
 
 /*
@@ -470,6 +471,12 @@ void debug_kmap_atomic(enum km_type type)
                         warn_count--;
                 }
         }
+#ifdef CONFIG_KGDB_KDB
+        if (unlikely(type == KM_KDB && atomic_read(&kgdb_active) == -1)) {
+                WARN_ON(1);
+                warn_count--;
+        }
+#endif /* CONFIG_KGDB_KDB */
 }
 
 #endif