gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine range and memobj flags before arch_vrflag_to_ptattr()

Browse Source
This commit is contained in:
Balazs Gerofi
2015-03-05 16:40:14 +09:00
parent f82bb284bb
commit 8b24f60861
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/process.c
View File

@ -1444,12 +1444,7 @@ static int page_fault_process_memory_range(struct process_vm *vm, struct vm_rang
page = phys_to_page(phys);
/* If Linux requested VR_WRITE_COMBINED, but the range is NOCACHE mapped,
* make sure we use VR_WRITE_COMBINED */
attr = arch_vrflag_to_ptattr(
(((memobj_flag & VR_WRITE_COMBINED) && (range->flag & VR_IO_NOCACHE)) ?
range->flag & ~(VR_IO_NOCACHE) : range->flag)
| memobj_flag, reason, ptep);
attr = arch_vrflag_to_ptattr(range->flag | memobj_flag, reason, ptep);
/*****/
if (((range->flag & VR_PRIVATE)