From 6cf89076dc81f398aa6e306fa0e3711eb788ebc5 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 31 Jul 2018 11:00:20 +0900 Subject: [PATCH] mcctrl handle_mm_fault compat: add el7.5 support Change-Id: I8c7738b70ca914e857be119b7720cdc22e61ae0e --- executer/kernel/mcctrl/syscall.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/executer/kernel/mcctrl/syscall.c b/executer/kernel/mcctrl/syscall.c index 5ef171f2..ca4edcf6 100644 --- a/executer/kernel/mcctrl/syscall.c +++ b/executer/kernel/mcctrl/syscall.c @@ -1842,11 +1842,12 @@ retry: goto out_release; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) || \ + (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) fault = handle_mm_fault(vma, va, flags); -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) */ +#else fault = handle_mm_fault(current->mm, vma, va, flags); -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) */ +#endif if (fault != 0) { printk("%s: error: faulting %lx at off: %lu\n", __FUNCTION__, va, off);