From b9bd55f8f16ccb18d2c818f215cce0f71dba628d Mon Sep 17 00:00:00 2001
From: Tony Battersby <tonyb@cybernetics.com>
Date: Wed, 4 Feb 2009 15:12:04 -0800
Subject: [PATCH] --- yaml --- r: 130965 b: refs/heads/master c:
 a68e61e8ff2d46327a37b69056998b47745db6fa h: refs/heads/master i:   130963:
 dfdccd3ee30533636b5b89969351ffcb505962fe v: v3

---
 [refs]          | 2 +-
 trunk/ipc/shm.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1ac9ec2bf41..310e010cd75e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f5e31d7e55ac7fbd4ec5e5b20c8868b0e4564c9
+refs/heads/master: a68e61e8ff2d46327a37b69056998b47745db6fa
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index c0a021f7f41a..f8f69fad3a27 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -565,11 +565,15 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
 			struct hstate *h = hstate_file(shp->shm_file);
 			*rss += pages_per_huge_page(h) * mapping->nrpages;
 		} else {
+#ifdef CONFIG_SHMEM
 			struct shmem_inode_info *info = SHMEM_I(inode);
 			spin_lock(&info->lock);
 			*rss += inode->i_mapping->nrpages;
 			*swp += info->swapped;
 			spin_unlock(&info->lock);
+#else
+			*rss += inode->i_mapping->nrpages;
+#endif
 		}
 
 		total++;