From c70038b2dedcf06528ad437a9460d0c5cb89bf63 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Fri, 14 Oct 2016 12:43:24 -0700 Subject: [PATCH] qcacld-3.0: 4.8 Kernel Migration - Remove VM_FAULT_MINOR VM_FAULT_MINOR was finally removed in the 4.7 Linux Kernel. According to the below documentation, we should be returning a bitmask. In this case, we are not handling the fault and should return 0, which happens to be what VM_FAULT_MINOR was defined as anyway. "The vma's ->fault is responsible for returning a bitmask of VM_FAULT_xxx flags that give details about how the fault was handled. Replace the reference to VM_FAULT_MINOR with 0. Change-Id: Id1703a61b8798f307630ccdbb7b928799490413e CRs-Fixed: 1078189 (cherry picked from commit 09dd4f4dfff7320a2312245f6952f56e5f322c6b) --- core/utils/pktlog/linux_ac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/utils/pktlog/linux_ac.c b/core/utils/pktlog/linux_ac.c index 8d8d6cc31d7d..37c8c87dc691 100644 --- a/core/utils/pktlog/linux_ac.c +++ b/core/utils/pktlog/linux_ac.c @@ -852,8 +852,9 @@ int pktlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf) get_page(virt_to_page((void *)address)); vmf->page = virt_to_page((void *)address); - return VM_FAULT_MINOR; + return 0; } + static struct vm_operations_struct pktlog_vmops = { open: pktlog_vopen, close:pktlog_vclose,