aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/shm.c
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/shm.c')
-rw-r--r--ipc/shm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index b27d31f3aaba..05c97c7513c2 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -61,8 +61,7 @@ static struct ipc_ids init_shm_ids;
61 61
62#define shm_unlock(shp) \ 62#define shm_unlock(shp) \
63 ipc_unlock(&(shp)->shm_perm) 63 ipc_unlock(&(shp)->shm_perm)
64#define shm_buildid(ns, id, seq) \ 64#define shm_buildid(id, seq) ipc_buildid(id, seq)
65 ipc_buildid(&shm_ids(ns), id, seq)
66 65
67static int newseg(struct ipc_namespace *, struct ipc_params *); 66static int newseg(struct ipc_namespace *, struct ipc_params *);
68static void shm_open(struct vm_area_struct *vma); 67static void shm_open(struct vm_area_struct *vma);
@@ -445,7 +444,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
445 shp->shm_ctim = get_seconds(); 444 shp->shm_ctim = get_seconds();
446 shp->shm_segsz = size; 445 shp->shm_segsz = size;
447 shp->shm_nattch = 0; 446 shp->shm_nattch = 0;
448 shp->shm_perm.id = shm_buildid(ns, id, shp->shm_perm.seq); 447 shp->shm_perm.id = shm_buildid(id, shp->shm_perm.seq);
449 shp->shm_file = file; 448 shp->shm_file = file;
450 /* 449 /*
451 * shmid gets reported as "inode#" in /proc/pid/maps. 450 * shmid gets reported as "inode#" in /proc/pid/maps.