i/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'x86/fpu', 'x86/mm' and 'x86/asm' into x86/pkeys

Browse Source 
Provide a stable basis for the pkeys patches, which touches various
x86 details.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2016-02-16 09:37:37 +01:00
parent 1926e54f11 58122bf1d8 e2c7698cd6 f2cc8e0791
commit 1fe3f29e4a
94 changed files with 1134 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/mmap.c
+9 -4
View File
@@ -3042,11 +3042,16 @@ static int special_mapping_fault(struct vm_area_struct *vma,
pgoff_t pgoff;
struct page **pages;
if (vma->vm_ops == &legacy_special_mapping_vmops)
if (vma->vm_ops == &legacy_special_mapping_vmops) {
pages = vma->vm_private_data;
else
pages = ((struct vm_special_mapping *)vma->vm_private_data)->
pages;
} else {
struct vm_special_mapping *sm = vma->vm_private_data;
if (sm->fault)
return sm->fault(sm, vma, vmf);
pages = sm->pages;
}
for (pgoff = vmf->pgoff; pgoff && *pages; ++pages)
pgoff--;