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;