From 1543119139320b0d5f846db84721b17ae85b8082 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 27 Jul 2018 10:08:37 +0900 Subject: [PATCH] mcctrl rus_vm_fault: tpe changed with kernel >= 4.11 vma is part of vmf and isn't needed, so type changed (see linux 11bac80 ("mm, fs: reduce fault, [...] to take only vmf")) Change-Id: I4c023e23c7e7416ad2df2dcc0698a0032e574e4c --- executer/kernel/mcctrl/syscall.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/executer/kernel/mcctrl/syscall.c b/executer/kernel/mcctrl/syscall.c index 402df0c3..5ef171f2 100644 --- a/executer/kernel/mcctrl/syscall.c +++ b/executer/kernel/mcctrl/syscall.c @@ -761,9 +761,15 @@ void rus_page_hash_put_pages(void) #define USE_VM_INSERT_PFN 1 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) +static int rus_vm_fault(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; +#else static int rus_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { - struct mcctrl_usrdata * usrdata = vma->vm_file->private_data; +#endif + struct mcctrl_usrdata *usrdata = vma->vm_file->private_data; ihk_device_t dev = ihk_os_to_dev(usrdata->os); unsigned long rpa; unsigned long phys;