X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ipc%2Fshm.c;h=a726aebce7d7f9c679f468343aaf62a4354d805c;hb=8c363265d57d755e62053e9f69a1f2164e83f7ea;hp=790240cd067f60860957951db601dfb2fc81e373;hpb=61d6cc54896811086b51fa78d440311974a09b3a;p=linux-2.6

diff --git a/ipc/shm.c b/ipc/shm.c
index 790240cd06..a726aebce7 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -577,7 +577,8 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
 
 		if (is_file_hugepages(shp->shm_file)) {
 			struct address_space *mapping = inode->i_mapping;
-			*rss += (HPAGE_SIZE/PAGE_SIZE)*mapping->nrpages;
+			struct hstate *h = hstate_file(shp->shm_file);
+			*rss += pages_per_huge_page(h) * mapping->nrpages;
 		} else {
 			struct shmem_inode_info *info = SHMEM_I(inode);
 			spin_lock(&info->lock);