sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-02-27 09:13:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clarified handling of anon and non-anon shared mappings.

Browse Source
This commit is contained in:
Bahadir Balban
2008-03-12 23:10:50 +00:00
parent d718b8efd5
commit e304bb26c6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/mm0/src/fault.c
View File

@@ -403,8 +403,8 @@ int __do_page_fault(struct fault_data *fault)
if (vma_flags & VMA_PRIVATE) { if (vma_flags & VMA_PRIVATE) {
copy_on_write(fault); copy_on_write(fault);
} }
/* FIXME: Just do fs files for now, anon shm objects later. */ /* Regular files */
if (vma_flags & VMA_SHARED) { if ((vma_flags & VMA_SHARED) && !(vma_flags & VMA_ANONYMOUS)) {
file_offset = fault_to_file_offset(fault); file_offset = fault_to_file_offset(fault);
BUG_ON(!(vmo_link = vma_next_link(&vma->vm_obj_list, BUG_ON(!(vmo_link = vma_next_link(&vma->vm_obj_list,
&vma->vm_obj_list))); &vma->vm_obj_list)));
@@ -423,7 +423,10 @@ int __do_page_fault(struct fault_data *fault)
(reason & VM_READ) ? MAP_USR_RO_FLAGS : MAP_USR_RW_FLAGS, (reason & VM_READ) ? MAP_USR_RO_FLAGS : MAP_USR_RW_FLAGS,
fault->task->tid); fault->task->tid);
} }
/* FIXME: Just do fs files for now, anon shm objects later. */
BUG_ON((vma_flags & VMA_SHARED) && (vma_flags & VMA_ANONYMOUS));
} }
return 0; return 0;
} }