From fd8db0131c3f67dab2cad6a15ed117cb0c4eaa2c Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 2 Aug 2011 12:35:04 +0200
Subject: [PATCH] --- yaml --- r: 262263 b: refs/heads/master c:
 d1afa65ca59d4e6a5f1a8c1ab9bfa73f2fa8b777 h: refs/heads/master i:   262261:
 a40320f8cfabfb9cc67f31b2d7b284645d289135   262259:
 c90a68c6bc5e5baba7b53aee54c0d6b4194b7d97   262255:
 1b17ce7fdc0830d2c5a05f58015cd2b7e71b98eb v: v3

---
 [refs]                    | 2 +-
 trunk/arch/tile/mm/init.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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