Skip to content
This repository has been archived by the owner on Feb 13, 2024. It is now read-only.

Fix compilation on kernels >= 5.1 #19

Merged
merged 6 commits into from Jul 13, 2019
Merged

Fix compilation on kernels >= 5.1 #19

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae35b8d
Fix compilation on kernels >= 5.1
May 12, 2019
ec5b60a
Add KVER=5.0 and KVER=5.1 to travis configuration
Jun 4, 2019
c0518e9
Update Travis configuration to use GCC 8
Jul 4, 2019
0b96354
Update Travis configuration
Jul 4, 2019
2dc5e2e
Update Travis configuration
Jul 4, 2019
85d3854
Update Travis configuration
Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ env:
- KVER=4.15
- KVER=4.16
- KVER=4.17
- KVER=5.0
- KVER=5.1
- KVER=master

matrix:
Expand Down
4 changes: 3 additions & 1 deletion binder/binder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3391,7 +3391,9 @@ static void binder_vma_close(struct vm_area_struct *vma)
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
}

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
This conversation was marked as resolved.
Show resolved Hide resolved
static vm_fault_t binder_vm_fault(struct vm_fault *vmf)
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
static int binder_vm_fault(struct vm_fault *vmf)
#else
static int binder_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
Expand Down