Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3496799pxj; Tue, 15 Jun 2021 02:08:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzc7pJRHhqPEceCGa8fl+QrjNsY9dzDoD5MDuzfSZejQZDgGTZxtqhilh8hb6+B5H6uDb/W X-Received: by 2002:a05:6402:170e:: with SMTP id y14mr22719701edu.367.1623748111049; Tue, 15 Jun 2021 02:08:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623748111; cv=none; d=google.com; s=arc-20160816; b=EeV0PKEX76Yx5FkAS4ZC68EDowS9ysYFq3VQAcHsDACwqY+5S7PnQiYulxuAdZ0u/Q KC+1kX4Z8mO3GmS4uidWE609WYcfC3RUxSOMcfhDt9mX13B6bv4TjDw3l+HuixtsjHi0 MjXhxCBGrmRdXPSE1588VqPtX9MrKS4SQrW07UhBMMQd56gMgrKZQXOm8f2Ggz7Ovobr sFVznCEjcMYTm3UzJSgUQTzseq8NNT50cakN4INPSIKKeXYBUthmeahutGr+TXTG7jU9 bl3q3O7i9kKX9p51mdtx3tjDvQZ0FjeUyNWreu+VYCd//fYQpcwmO+T/Ie0MGrpF1nIF Ui1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=MloJ6ZhvgEn9kbepy+/DsPZQs/NVgw8YmFyxNiO1fi8=; b=06qhfPq+HRDroPczxIxcTSgSVr+oxvzmsFiIeep2aZtwYqdR8PMqhVXi3NOzfcU8kL FsqpEbVg2+zp+MxkmADJiA4GNMr3M40rdg55CTIwJGdk7t2DGBUqdxzaS/bGtaTXd6mD TrdVApuypEHLLK24MNErgL5QHth/HS6zuzL0VAbR5zlw1KqMZ5N3SaW1CRXaA775ZjzG MXBvmlmFRDeDqKUOEZEbCiLA4z8Yuj+xWN+AeEgLuescKh953Jic0vcaTx5QqL+A5KZh AUHVwrIQxsWJSTbpg5UcV5IkdQTsz6fiMptMEobKoQRZI7ZPXY0T9TLlad/SnO0+sPhF VLCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y3si15415179eda.72.2021.06.15.02.08.08; Tue, 15 Jun 2021 02:08:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231289AbhFOJG7 (ORCPT + 99 others); Tue, 15 Jun 2021 05:06:59 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:4913 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230332AbhFOJG6 (ORCPT ); Tue, 15 Jun 2021 05:06:58 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4G42PM3B31z704v; Tue, 15 Jun 2021 17:01:43 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 15 Jun 2021 17:04:43 +0800 Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 15 Jun 2021 17:04:40 +0800 From: Yanan Wang To: Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , "Will Deacon" CC: , , , , , Yanan Wang Subject: [PATCH] KVM: arm64: Fix inconsistency from function comment of __unmap_stage2_range Date: Tue, 15 Jun 2021 17:04:36 +0800 Message-ID: <20210615090436.13916-1-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 'b5331379bc626' (KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set) has converted the original function name 'unmap_stage2_range' to '__unmap_stage2_range', but leaving the corresponding function comment unadjusted. So fix it for code readability. Incidentally, we also tewak some comment identation by using tabs instead of spaces to be consistent with the other functions. Signed-off-by: Yanan Wang --- arch/arm64/kvm/mmu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 5742ba765ff9..80040af147a2 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -151,11 +151,11 @@ static void *kvm_host_va(phys_addr_t phys) * does. */ /** - * unmap_stage2_range -- Clear stage2 page table entries to unmap a range - * @mmu: The KVM stage-2 MMU pointer - * @start: The intermediate physical base address of the range to unmap - * @size: The size of the area to unmap - * @may_block: Whether or not we are permitted to block + * __unmap_stage2_range -- Clear stage2 page table entries to unmap a range + * @mmu: The KVM stage-2 MMU pointer + * @start: The intermediate physical base address of the range to unmap + * @size: The size of the area to unmap + * @may_block: Whether or not we are permitted to block * * Clear a range of stage-2 mappings, lowering the various ref-counts. Must * be called while holding mmu_lock (unless for freeing the stage2 pgd before @@ -190,7 +190,7 @@ static void stage2_flush_memslot(struct kvm *kvm, /** * stage2_flush_vm - Invalidate cache for pages mapped in stage 2 - * @kvm: The struct kvm pointer + * @kvm: The struct kvm pointer * * Go through the stage 2 page tables and invalidate any cache lines * backing memory already mapped to the VM. @@ -527,7 +527,7 @@ static void stage2_unmap_memslot(struct kvm *kvm, /** * stage2_unmap_vm - Unmap Stage-2 RAM mappings - * @kvm: The struct kvm pointer + * @kvm: The struct kvm pointer * * Go through the memregions and unmap any regular RAM * backing memory already mapped to the VM. @@ -578,7 +578,7 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu) * @guest_ipa: The IPA at which to insert the mapping * @pa: The physical address of the device * @size: The size of the mapping - * @writable: Whether or not to create a writable mapping + * @writable: Whether or not to create a writable mapping */ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, phys_addr_t pa, unsigned long size, bool writable) @@ -616,7 +616,7 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, /** * stage2_wp_range() - write protect stage2 memory region range - * @mmu: The KVM stage-2 MMU pointer + * @mmu: The KVM stage-2 MMU pointer * @addr: Start address of range * @end: End address of range */ -- 2.23.0