From: Andrew Morton <akpm@osdl.org>

I'm not so sure, and if this is wrong, we wreck an -mm release.  Please don't
wreck -mm releases.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/rmap.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/rmap.c~mm-tracking-shared-dirty-pages-wimp mm/rmap.c
--- a/mm/rmap.c~mm-tracking-shared-dirty-pages-wimp
+++ a/mm/rmap.c
@@ -488,7 +488,7 @@ int page_mkclean(struct page *page)
 {
 	int ret = 0;
 
-	BUG_ON(!PageLocked(page));
+	WARN_ON_ONCE(!PageLocked(page));
 
 	if (page_mapped(page)) {
 		struct address_space *mapping = page_mapping(page);
_