From e95cc3d216dd4c9856a1caa8b88ef2c45d9281f9 Mon Sep 17 00:00:00 2001
From: Thomas Tuttle <ttuttle@google.com>
Date: Thu, 5 Jun 2008 22:46:58 -0700
Subject: [PATCH] --- yaml --- r: 97828 b: refs/heads/master c:
 bbcdac0c20aa20d1daad41d9c138102b70e5aae4 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/proc/proc_misc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f95ce781f0d0..6b35976eca1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4fa7ef037b17f2a3b9b393cb924e571fc04e784
+refs/heads/master: bbcdac0c20aa20d1daad41d9c138102b70e5aae4
diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c
index 32dc14cd8900..5a16090a6d6e 100644
--- a/trunk/fs/proc/proc_misc.c
+++ b/trunk/fs/proc/proc_misc.c
@@ -726,7 +726,7 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf,
 		if (!ppage)
 			pcount = 0;
 		else
-			pcount = atomic_read(&ppage->_count);
+			pcount = page_mapcount(ppage);
 
 		if (put_user(pcount, out++)) {
 			ret = -EFAULT;