diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-01-31 15:18:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-01-31 16:58:35 +1000 |
| commit | b45f1b3b585e195a7daead16d914e164310b1df6 (patch) | |
| tree | 6559d233ad438a3ac7ca2f9092c671284a6a9512 /include/linux/mm.h | |
| parent | d47c7f06268082bc0082a15297a07c0da59b0fc4 (diff) | |
| parent | 5379e4dd3220e23f68ce70b76b3a52a9a68cee05 (diff) | |
Merge branch 'ttm-prot-fix' of git://people.freedesktop.org/~thomash/linux into drm-next
A small fix for the long-standing ttm vm page protection hack.
Sent as a separate PR as it touches mm, has all acks in place.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellström (VMware) <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200116102411.3056-1-thomas_os@shipmail.org
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index cfaa8feecfe8..5adb8141d271 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2533,6 +2533,8 @@ vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn, pgprot_t pgprot); vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr, pfn_t pfn); +vm_fault_t vmf_insert_mixed_prot(struct vm_area_struct *vma, unsigned long addr, + pfn_t pfn, pgprot_t pgprot); vm_fault_t vmf_insert_mixed_mkwrite(struct vm_area_struct *vma, unsigned long addr, pfn_t pfn); int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len); |