diff --git a/[refs] b/[refs]
index 31ffec352cd8..4cfb6fc5f9c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37682177af68478fa83429b735fa16913c2fbb2b
+refs/heads/master: 6c5e303afdf2910e58aeda56c10506342545a5af
diff --git a/trunk/include/asm-generic/kmap_types.h b/trunk/include/asm-generic/kmap_types.h
index 97e807c8c812..0232ccb76f2b 100644
--- a/trunk/include/asm-generic/kmap_types.h
+++ b/trunk/include/asm-generic/kmap_types.h
@@ -29,6 +29,9 @@ KMAP_D(16)	KM_IRQ_PTE,
 KMAP_D(17)	KM_NMI,
 KMAP_D(18)	KM_NMI_PTE,
 KMAP_D(19)	KM_KDB,
+/*
+ * Remember to update debug_kmap_atomic() when adding new kmap types!
+ */
 KMAP_D(20)	KM_TYPE_NR
 };