diff --git a/[refs] b/[refs]
index 42671a55c89b..2e36aec475eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d071cd313643cf82b1ce1ce4fdf08d63ad53964
+refs/heads/master: d1afa65ca59d4e6a5f1a8c1ab9bfa73f2fa8b777
diff --git a/trunk/arch/tile/mm/init.c b/trunk/arch/tile/mm/init.c
index 4e10c4023028..7309988c9794 100644
--- a/trunk/arch/tile/mm/init.c
+++ b/trunk/arch/tile/mm/init.c
@@ -836,8 +836,7 @@ void __init mem_init(void)
 #endif
 
 #ifdef CONFIG_FLATMEM
-	if (!mem_map)
-		BUG();
+	BUG_ON(!mem_map);
 #endif
 
 #ifdef CONFIG_HIGHMEM