patch-2.1.89 linux/ipc/shm.c
Next file: linux/kernel/acct.c
Previous file: linux/include/net/tcp.h
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Fri Feb 27 10:52:09 1998
- Orig file:
v2.1.88/linux/ipc/shm.c
- Orig date:
Tue Dec 9 09:49:59 1997
diff -u --recursive --new-file v2.1.88/linux/ipc/shm.c linux/ipc/shm.c
@@ -561,7 +561,7 @@
shmd->vm_flags = VM_SHM | VM_MAYSHARE | VM_SHARED
| VM_MAYREAD | VM_MAYEXEC | VM_READ | VM_EXEC
| ((shmflg & SHM_RDONLY) ? 0 : VM_MAYWRITE | VM_WRITE);
- shmd->vm_dentry = NULL;
+ shmd->vm_file = NULL;
shmd->vm_offset = 0;
shmd->vm_ops = &shm_vm_ops;
@@ -689,7 +689,7 @@
goto done;
}
if (!pte_none(pte)) {
- read_swap_page(pte_val(pte), (char *) page);
+ rw_swap_page_nocache(READ, pte_val(pte), (char *)page);
pte = __pte(shp->shm_pages[idx]);
if (pte_present(pte)) {
free_page (page); /* doesn't sleep */
@@ -820,7 +820,7 @@
if (atomic_read(&mem_map[MAP_NR(pte_page(page))].count) != 1)
goto check_table;
shp->shm_pages[idx] = swap_nr;
- write_swap_page (swap_nr, (char *) pte_page(page));
+ rw_swap_page_nocache (WRITE, swap_nr, (char *) pte_page(page));
free_page(pte_page(page));
swap_successes++;
shm_swp++;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov