From 530e5527988af55835384699e4d37732a124869b Mon Sep 17 00:00:00 2001
From: Robin Holt <holt@sgi.com>
Date: Tue, 23 Mar 2010 13:35:26 -0700
Subject: [PATCH] --- yaml --- r: 188911 b: refs/heads/master c:
 cb53237513bd1e090cce120efe12ede72c932b5f h: refs/heads/master i:   188909:
 4a18cf7b29a2e155b60ab36568920723691b410c   188907:
 55c774d95e18e9415c356d3cff6ecd42d46298fd   188903:
 665b60c2435ae30fcfe7a524a2cabda006dbe708   188895:
 5a8dad1929a084a0377c356dee301fb6474c65d7 v: v3

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

diff --git a/[refs] b/[refs]
index 4945893e3b5c..5040293da6d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20072205fcdf7d85cd3101f1f11dfab333c5fd0c
+refs/heads/master: cb53237513bd1e090cce120efe12ede72c932b5f
diff --git a/trunk/mm/ksm.c b/trunk/mm/ksm.c
index a93f1b7f508c..8cdfc2a1e8bf 100644
--- a/trunk/mm/ksm.c
+++ b/trunk/mm/ksm.c
@@ -751,7 +751,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page,
 		 * page
 		 */
 		if (page_mapcount(page) + 1 + swapped != page_count(page)) {
-			set_pte_at_notify(mm, addr, ptep, entry);
+			set_pte_at(mm, addr, ptep, entry);
 			goto out_unlock;
 		}
 		entry = pte_wrprotect(entry);