diff --git a/[refs] b/[refs]
index df111489a278..e8b053eeb5d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd08c40e3e23f868eb0e49f638eb208736ec7e66
+refs/heads/master: 30475cc12a50816f290828fb7e3cd7036cd622df
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 4fefbad7096d..02faa54dbf5a 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -397,6 +397,11 @@ static int newseg (struct ipc_namespace *ns, key_t key, int shmflg, size_t size)
 	shp->shm_nattch = 0;
 	shp->id = shm_buildid(ns, id, shp->shm_perm.seq);
 	shp->shm_file = file;
+	/*
+	 * shmid gets reported as "inode#" in /proc/pid/maps.
+	 * proc-ps tools use this. Changing this will break them.
+	 */
+	file->f_dentry->d_inode->i_ino = shp->id;
 
 	ns->shm_tot += numpages;
 	shm_unlock(shp);