patch-2.0.19 linux/ipc/shm.c
Next file: linux/kernel/ksyms.c
Previous file: linux/init/main.c
Back to the patch index
Back to the overall index
- Lines: 20
- Date:
Mon Sep 9 21:04:57 1996
- Orig file:
v2.0.18/linux/ipc/shm.c
- Orig date:
Sun Sep 1 09:15:34 1996
diff -u --recursive --new-file v2.0.18/linux/ipc/shm.c linux/ipc/shm.c
@@ -425,8 +425,8 @@
/* add new mapping */
current->mm->total_vm += (shmd->vm_end - shmd->vm_start) >> PAGE_SHIFT;
- insert_vm_struct(current, shmd);
- merge_segments(current, shmd->vm_start, shmd->vm_end);
+ insert_vm_struct(current->mm, shmd);
+ merge_segments(current->mm, shmd->vm_start, shmd->vm_end);
/* map page range */
error = 0;
@@ -505,7 +505,7 @@
return -EINVAL;
}
if (!(shmflg & SHM_REMAP))
- if ((shmd = find_vma_intersection(current, addr, addr + shp->shm_segsz))) {
+ if ((shmd = find_vma_intersection(current->mm, addr, addr + shp->shm_segsz))) {
/* printk("shmat() -> EINVAL because the interval [0x%lx,0x%lx) intersects an already mapped interval [0x%lx,0x%lx).\n",
addr, addr + shp->shm_segsz, shmd->vm_start, shmd->vm_end); */
return -EINVAL;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov