From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751025AbeEUSXK (ORCPT ); Mon, 21 May 2018 14:23:10 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:35125 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750773AbeEUSXH (ORCPT ); Mon, 21 May 2018 14:23:07 -0400 X-Google-Smtp-Source: AB8JxZq1lqck1mGnFy2zpfBc+gEbXPbYwy4cOfvnj0i0fSZALorAcrNfjYQUfNZXJjLs0iYTqYXeIg== Date: Mon, 21 May 2018 23:55:20 +0530 From: Souptick Joarder To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2] kernel: event: core: Change return type to vm_fault_t Message-ID: <20180521182520.GA19677@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type. Ref-> commit 1c8f422059ae ("mm: change return type to vm_fault_t") Signed-off-by: Souptick Joarder Acked-by: Peter Zijlstra (Intel) Reviewed-by: Matthew Wilcox --- v2: Updated the change log. Acked by Peter Zijlstra. kernel/events/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 96db9ae..d09f1c4 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -4918,11 +4918,11 @@ void perf_event_update_userpage(struct perf_event *event) } EXPORT_SYMBOL_GPL(perf_event_update_userpage); -static int perf_mmap_fault(struct vm_fault *vmf) +static vm_fault_t perf_mmap_fault(struct vm_fault *vmf) { struct perf_event *event = vmf->vma->vm_file->private_data; struct ring_buffer *rb; - int ret = VM_FAULT_SIGBUS; + vm_fault_t ret = VM_FAULT_SIGBUS; if (vmf->flags & FAULT_FLAG_MKWRITE) { if (vmf->pgoff == 0) -- 1.9.1