diff --git a/[refs] b/[refs]
index 65772fd4ff01..4380e627f74b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1bf9631be7332ce0641e299ddafad2d8223100f
+refs/heads/master: 7aa413def76146f7b3784228556d9e4bc562eab3
diff --git a/trunk/include/linux/mmdebug.h b/trunk/include/linux/mmdebug.h
index 860ed1a71bbe..8a5509877192 100644
--- a/trunk/include/linux/mmdebug.h
+++ b/trunk/include/linux/mmdebug.h
@@ -6,13 +6,13 @@
 #ifdef CONFIG_DEBUG_VM
 #define VM_BUG_ON(cond) BUG_ON(cond)
 #else
-#define VM_BUG_ON(cond) do { } while(0)
+#define VM_BUG_ON(cond) do { } while (0)
 #endif
 
 #ifdef CONFIG_DEBUG_VIRTUAL
 #define VIRTUAL_BUG_ON(cond) BUG_ON(cond)
 #else
-#define VIRTUAL_BUG_ON(cond) do { } while(0)
+#define VIRTUAL_BUG_ON(cond) do { } while (0)
 #endif
 
 #endif
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index dc41e9c8ca6f..830a5580c5d7 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -180,8 +180,10 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
 	pmd_t *pmd;
 	pte_t *ptep, pte;
 
-	/* XXX we might need to change this if we add VIRTUAL_BUG_ON for
-	 * architectures that do not vmalloc module space */
+	/*
+	 * XXX we might need to change this if we add VIRTUAL_BUG_ON for
+	 * architectures that do not vmalloc module space
+	 */
 	VIRTUAL_BUG_ON(!is_vmalloc_addr(vmalloc_addr) &&
 			!is_module_address(addr));