From d221344c759dce3a68f0d10f9058e379cb1aa769 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 17:00:19 -0400 Subject: [PATCH] ring buffer mmap: remove compatibility code --- lib/ringbuffer/ring_buffer_mmap.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lib/ringbuffer/ring_buffer_mmap.c b/lib/ringbuffer/ring_buffer_mmap.c index c5abe847..40fd41eb 100644 --- a/lib/ringbuffer/ring_buffer_mmap.c +++ b/lib/ringbuffer/ring_buffer_mmap.c @@ -20,11 +20,7 @@ /* * fault() vm_op implementation for ring buffer file mapping. */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)) static vm_fault_t lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf) -#else -static int lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf) -#endif { struct lib_ring_buffer *buf = vma->vm_private_data; struct channel *chan = buf->backend.chan; @@ -57,24 +53,11 @@ static int lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fa return 0; } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)) static vm_fault_t lib_ring_buffer_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; return lib_ring_buffer_fault_compat(vma, vmf); } -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) -static int lib_ring_buffer_fault(struct vm_fault *vmf) -{ - struct vm_area_struct *vma = vmf->vma; - return lib_ring_buffer_fault_compat(vma, vmf); -} -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */ -static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -{ - return lib_ring_buffer_fault_compat(vma, vmf); -} -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */ /* * vm_ops for ring buffer file mappings. -- 2.34.1