From e35f35b25c43b9f6fa967b2ae92462034a14bc8d Mon Sep 17 00:00:00 2001 From: Andreas Stewering-Bone Date: Thu, 1 Jun 2023 05:53:32 +0000 Subject: [PATCH] Merge branch 'fix_vm_set_flag' into 'stable-1.5' Fix setting flag in vm_area_struct for Kernel 6.3 See merge request etherlab.org/ethercat!67 (cherry picked from commit 04f202a39c9b42e996759912db532d9a215b12be) 27db882d Fix setting flag in vm_area_struct for Kernel 6.3 --- master/cdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/master/cdev.c b/master/cdev.c index 5bba2be0..36e584f0 100644 --- a/master/cdev.c +++ b/master/cdev.c @@ -243,7 +243,11 @@ int eccdev_mmap( EC_MASTER_DBG(priv->cdev->master, 1, "mmap()\n"); vma->vm_ops = &eccdev_vm_ops; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) + vm_flags_set(vma, VM_DONTDUMP); +#else vma->vm_flags |= VM_DONTDUMP; /* Pages will not be swapped out */ +#endif vma->vm_private_data = priv; return 0;