bughz/anbox-modules
1
0
Fork 0
mirror of https://github.com/choff/anbox-modules.git synced 2025-11-04 07:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from 86423355844265459587182778/master

Browse Source 
Fix compilation on kernels >= 5.1
This commit is contained in:
Simon Fels 2019-07-13 11:32:21 +02:00 committed by GitHub
commit 816dd4d6e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -4,6 +4,8 @@ sudo: false
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- bison - bison
- flex - flex
@ -12,6 +14,7 @@ addons:
- debhelper - debhelper
- dkms - dkms
- fakeroot - fakeroot
- gcc-8
env: env:
- KVER=4.4 - KVER=4.4
@ -22,7 +25,9 @@ env:
- KVER=4.15 - KVER=4.15
- KVER=4.16 - KVER=4.16
- KVER=4.17 - KVER=4.17
- KVER=master - KVER=5.0 && CC=gcc-8
- KVER=5.1 && CC=gcc-8
- KVER=master && CC=gcc-8
matrix: matrix:
allow_failures: allow_failures:
@ -33,4 +38,4 @@ matrix:
env: KVER="Debian Package Building" env: KVER="Debian Package Building"
script: script:
- ./scripts/build-against-kernel.sh ${KVER} - ./scripts/build-against-kernel.sh ${KVER} ${CC}

4
binder/binder.c
View File

@ -3391,7 +3391,9 @@ static void binder_vma_close(struct vm_area_struct *vma)
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 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)
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) static int binder_vm_fault(struct vm_fault *vmf)
#else #else
static int binder_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) static int binder_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

11
scripts/build-against-kernel.sh
View File

@ -3,6 +3,7 @@
set -ex set -ex
KVER=${1:-master} KVER=${1:-master}
CC=${2:-gcc}
src_dir="../linux-${KVER}" src_dir="../linux-${KVER}"
@ -18,17 +19,17 @@ fi
( (
cd "$src_dir" || exit 1 cd "$src_dir" || exit 1
make allmodconfig make allmodconfig CC=${CC} HOSTCC=${CC}
make prepare make prepare CC=${CC} HOSTCC=${CC}
make scripts make scripts CC=${CC} HOSTCC=${CC}
) )
( (
cd ashmem || exit 1 cd ashmem || exit 1
make KERNEL_SRC="../${src_dir}" make KERNEL_SRC="../${src_dir}" CC=${CC} HOSTCC=${CC}
) )
( (
cd binder || exit 1 cd binder || exit 1
make KERNEL_SRC="../${src_dir}" make KERNEL_SRC="../${src_dir}" CC=${CC} HOSTCC=${CC}
) )