diff --git a/[refs] b/[refs]
index fc7cad682907..ded9c50edeaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4569d2e6949a63851032b40c811913d4a6f85f5
+refs/heads/master: 7dddb12c63553db850365cfd066a00416aa8c6cb
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 950ebd43cdc3..0291a68a3626 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -561,7 +561,7 @@ static int exec_mmap(struct mm_struct *mm)
 	arch_pick_mmap_layout(mm);
 	if (old_mm) {
 		up_read(&old_mm->mmap_sem);
-		if (active_mm != old_mm) BUG();
+		BUG_ON(active_mm != old_mm);
 		mmput(old_mm);
 		return 0;
 	}