From 21bda4ff391a53d33ce20c73706c2e2857e6706e Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Tue, 21 Aug 2012 16:15:45 -0700
Subject: [PATCH] --- yaml --- r: 322072 b: refs/heads/master c:
 f9aed62a2b12a8e04077737c9942111e14ed738e h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1783cf072d0..1d446c169ee7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61e01be22e954f53a4bbac8066015d9f4ab9e42d
+refs/heads/master: f9aed62a2b12a8e04077737c9942111e14ed738e
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index e3e86914f11a..9adee9fc0d8a 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -2309,7 +2309,7 @@ void exit_mmap(struct mm_struct *mm)
 	}
 	vm_unacct_memory(nr_accounted);
 
-	BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
+	WARN_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
 }
 
 /* Insert vm structure into process list sorted by address