From ae35b8da224b7ba163ebc1b3cf94acc2b0da260b Mon Sep 17 00:00:00 2001
From: Anonymous <>
Date: Sun, 12 May 2019 12:45:44 +0900
Subject: [PATCH 1/6] Fix compilation on kernels >= 5.1

---
 binder/binder.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/binder/binder.c b/binder/binder.c
index a9d04b2..d3829a0 100644
--- a/binder/binder.c
+++ b/binder/binder.c
@@ -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)
+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)

From ec5b60a231a9ff8570452fa0b64a555587a4c294 Mon Sep 17 00:00:00 2001
From: Anonymous <>
Date: Tue, 4 Jun 2019 15:43:43 +0900
Subject: [PATCH 2/6] Add KVER=5.0 and KVER=5.1 to travis configuration

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 54d9974..5843f2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,8 @@ env:
   - KVER=4.15
   - KVER=4.16
   - KVER=4.17
+  - KVER=5.0
+  - KVER=5.1
   - KVER=master
 
 matrix:

From c0518e945df485655aa9d3283bf127ce483bd0f0 Mon Sep 17 00:00:00 2001
From: Anonymous <>
Date: Thu, 4 Jul 2019 18:37:54 +0900
Subject: [PATCH 3/6] Update Travis configuration to use GCC 8

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5843f2d..23133d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ sudo: false
 
 addons:
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
       - bison
       - flex
@@ -12,6 +14,7 @@ addons:
       - debhelper
       - dkms
       - fakeroot
+      - gcc-8
 
 env:
   - KVER=4.4
@@ -22,9 +25,9 @@ env:
   - KVER=4.15
   - KVER=4.16
   - KVER=4.17
-  - KVER=5.0
-  - KVER=5.1
-  - KVER=master
+  - KVER=5.0 && CC=gcc-8
+  - KVER=5.1 && CC=gcc-8
+  - KVER=master && CC=gcc-8
 
 matrix:
   allow_failures:

From 0b96354396089dd752460eb13caabb0f7e74a668 Mon Sep 17 00:00:00 2001
From: Anonymous <>
Date: Thu, 4 Jul 2019 18:44:11 +0900
Subject: [PATCH 4/6] Update Travis configuration

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23133d2..de910cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
       - debhelper
       - dkms
       - fakeroot
-      - gcc-8
+      - g++-8
 
 env:
   - KVER=4.4
@@ -25,9 +25,9 @@ env:
   - KVER=4.15
   - KVER=4.16
   - KVER=4.17
-  - KVER=5.0 && CC=gcc-8
-  - KVER=5.1 && CC=gcc-8
-  - KVER=master && CC=gcc-8
+  - KVER=5.0 && CC=gcc-8 && CXX=g++-8
+  - KVER=5.1 && CC=gcc-8 && CXX=g++-8
+  - KVER=master && CC=gcc-8 && CXX=g++-8
 
 matrix:
   allow_failures:

From 2dc5e2e70aa9486dbdf8094c516d7d0480100601 Mon Sep 17 00:00:00 2001
From: Anonymous <>
Date: Thu, 4 Jul 2019 18:54:57 +0900
Subject: [PATCH 5/6] Update Travis configuration

---
 .travis.yml                     | 10 +++++-----
 scripts/build-against-kernel.sh |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index de910cb..a01199f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
       - debhelper
       - dkms
       - fakeroot
-      - g++-8
+      - gcc-8
 
 env:
   - KVER=4.4
@@ -25,9 +25,9 @@ env:
   - KVER=4.15
   - KVER=4.16
   - KVER=4.17
-  - KVER=5.0 && CC=gcc-8 && CXX=g++-8
-  - KVER=5.1 && CC=gcc-8 && CXX=g++-8
-  - KVER=master && CC=gcc-8 && CXX=g++-8
+  - KVER=5.0 && CC=gcc-8
+  - KVER=5.1 && CC=gcc-8
+  - KVER=master && CC=gcc-8
 
 matrix:
   allow_failures:
@@ -38,4 +38,4 @@ matrix:
     env: KVER="Debian Package Building"
 
 script:
-  - ./scripts/build-against-kernel.sh ${KVER}
+  - ./scripts/build-against-kernel.sh ${KVER} ${CC}
diff --git a/scripts/build-against-kernel.sh b/scripts/build-against-kernel.sh
index 6445484..dd258e1 100755
--- a/scripts/build-against-kernel.sh
+++ b/scripts/build-against-kernel.sh
@@ -3,6 +3,7 @@
 set -ex
 
 KVER=${1:-master}
+CC=${2:-gcc}
 
 src_dir="../linux-${KVER}"
 

From 85d38547193a62103c3ab16080db3b69f3132422 Mon Sep 17 00:00:00 2001
From: Anonymous <>
Date: Thu, 4 Jul 2019 19:02:11 +0900
Subject: [PATCH 6/6] Update Travis configuration

---
 scripts/build-against-kernel.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/build-against-kernel.sh b/scripts/build-against-kernel.sh
index dd258e1..da23e4d 100755
--- a/scripts/build-against-kernel.sh
+++ b/scripts/build-against-kernel.sh
@@ -19,17 +19,17 @@ fi
 
 (
 cd "$src_dir" || exit 1
-make allmodconfig
-make prepare
-make scripts
+make allmodconfig CC=${CC} HOSTCC=${CC}
+make prepare CC=${CC} HOSTCC=${CC}
+make scripts CC=${CC} HOSTCC=${CC}
 )
 
 (
 cd ashmem || exit 1
-make KERNEL_SRC="../${src_dir}"
+make KERNEL_SRC="../${src_dir}" CC=${CC} HOSTCC=${CC}
 )
 
 (
 cd binder || exit 1
-make KERNEL_SRC="../${src_dir}"
+make KERNEL_SRC="../${src_dir}" CC=${CC} HOSTCC=${CC}
 )