From b3d7bbda5624d596c4e61a5346c292ead1dea67d Mon Sep 17 00:00:00 2001
From: Masamichi Takagi <masamichi.takagi@riken.jp>
Date: Thu, 25 Jun 2020 12:31:19 +0900
Subject: [PATCH] rus_vm_fault: compat: RHEL-8.2

This applies the following patch:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1c8f422059ae5da07db7406ab916203f9417e396
mm: change return type to vm_fault_t

Change-Id: I7189fc92824d21b4906f1033f1de5899bbad4680
---
 executer/kernel/mcctrl/syscall.c | 4 ++++
 ihk                              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/executer/kernel/mcctrl/syscall.c b/executer/kernel/mcctrl/syscall.c
index 3fd22112..469065f1 100644
--- a/executer/kernel/mcctrl/syscall.c
+++ b/executer/kernel/mcctrl/syscall.c
@@ -539,7 +539,11 @@ retry_alloc:
 #define	USE_VM_INSERT_PFN	1
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 2)
+static vm_fault_t rus_vm_fault(struct vm_fault *vmf)
+#else
 static int rus_vm_fault(struct vm_fault *vmf)
+#endif
 {
 	struct vm_area_struct *vma = vmf->vma;
 #else
diff --git a/ihk b/ihk
index 7c4b8d6b..df12c910 160000
--- a/ihk
+++ b/ihk
@@ -1 +1 @@
-Subproject commit 7c4b8d6b40dd4530dc350e9138407e31a6882754
+Subproject commit df12c9102cb2161e09affacaa9488b6e26a11fbf