From e53168a5e7db9f02569c968df06e19809159ed70 Mon Sep 17 00:00:00 2001
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Date: Fri, 10 Sep 2010 13:23:06 +0900
Subject: [PATCH] --- yaml --- r: 210940 b: refs/heads/master c:
 a850ea30374ebed32a0724742601861853fde869 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/rmap.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3df0ecdd88c5..a61d84945820 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56c9cfb13c9b6516017eea4e8cbe22ea02e07ee6
+refs/heads/master: a850ea30374ebed32a0724742601861853fde869
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index 2854857fd63b..9d2ba01bd4f9 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -1582,6 +1582,8 @@ void hugepage_add_anon_rmap(struct page *page,
 {
 	struct anon_vma *anon_vma = vma->anon_vma;
 	int first;
+
+	BUG_ON(!PageLocked(page));
 	BUG_ON(!anon_vma);
 	BUG_ON(address < vma->vm_start || address >= vma->vm_end);
 	first = atomic_inc_and_test(&page->_mapcount);