Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 547b1e81afe3119f7daf702cc03b158495535a25

Authored by Linus Torvalds
1 parent 9e2d8656f5
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Fix staging driver use of VM_RESERVED 

The VM_RESERVED flag was killed off in commit 314e51b9851b ("mm: kill
vma flag VM_RESERVED and mm->reserved_vm counter"), and replaced by the
proper semantic flags (eg "don't core-dump" etc).  But there was a new
use of VM_RESERVED that got missed by the merge.

Fix the remaining use of VM_RESERVED in the vfio_pci driver, replacing
the VM_RESERVED flag with VM_DONTEXPAND | VM_DONTDUMP.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation,org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/vfio/pci/vfio_pci.c
Diff comments   View file @ 547b1e8
... ... @@ -461,7 +461,7 @@
461 461 }
462 462  
463 463 vma->vm_private_data = vdev;
464   - vma->vm_flags |= (VM_IO | VM_RESERVED);
  464 + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
465 465 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
466 466  
467 467 phys = (pci_resource_start(pdev, index) >> PAGE_SHIFT) + pgoff;