#include <linux/module.h>
#include <linux/mm.h>
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
/*
* fault() vm_op implementation for ring buffer file mapping.
*/
-static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct lib_ring_buffer *buf = vma->vm_private_data;
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
pgoff_t pgoff = vmf->pgoff;
- struct page **page;
+ unsigned long *pfnp;
void **virt;
unsigned long offset, sb_bindex;
buf->backend.chan->backend.subbuf_size))
return VM_FAULT_SIGBUS;
/*
- * ring_buffer_read_get_page() gets the page in the current reader's
- * pages.
+ * ring_buffer_read_get_pfn() gets the page frame number for the
+ * current reader's pages.
*/
- page = lib_ring_buffer_read_get_page(&buf->backend, offset, &virt);
- if (!*page)
+ pfnp = lib_ring_buffer_read_get_pfn(&buf->backend, offset, &virt);
+ if (!*pfnp)
return VM_FAULT_SIGBUS;
- get_page(*page);
- vmf->page = *page;
+ get_page(pfn_to_page(*pfnp));
+ vmf->page = pfn_to_page(*pfnp);
return 0;
}
+#if (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.
*/