From patchwork Tue Sep 15 10:46:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Scull X-Patchwork-Id: 11776131 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A549618 for ; Tue, 15 Sep 2020 10:59:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0458206DC for ; Tue, 15 Sep 2020 10:59:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="L/eHqD5L"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="G48FZrRl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0458206DC Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iF79Ief6B8wjhmCW73XrmlxM8aaFZLqyMSVLue2pREQ=; b=L/eHqD5LiAnBeB2el2gnUDXgk eKcWEZGB1zvfWCJ0fgD1zbddhNz+wmGutOiKvCzenlSLBj37MAvrpB1IZxhsTNgbw5TSa1B/s5avx ggJgcVAmhit30AWbqgrtZzhz4nVNwGWKJqQ1Ou1eDRiNo5W53rP05rv4ttMrTbJBIVWuAUUwsH03h h3aJsXTbdKfA94uDSXjm9K6QqXBL6u6F/G0lcvLlh6TLFhoBRyX/gbGrqEEXbPlryJsNoZgS04tKY LNYoiTZSFH0rzmGIR9boS9TpmaNI4vF31UXBRhKd04qlwHJIldmAZ+6i1qVF4Kf2SDKG/lRbCEKpo L0jaIFt0A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kI8cH-0004FU-UI; Tue, 15 Sep 2020 10:55:20 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kI8UG-0000oE-CU for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 10:47:02 +0000 Received: by mail-qt1-x84a.google.com with SMTP id c5so2381806qtd.12 for ; Tue, 15 Sep 2020 03:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=gTjGw9ImztLyDWYkFo0dNEUflgDWtEiIdiP6CPvSqDM=; b=G48FZrRlJijGlOd52Jxp3+TlqDvCWO+Dl+se1eSdYve/GDvTP7M9s9J1/cP5yznoHf RqgcER3vR6dgEJWeaPSrWkVhqFJOb0Csdqdl1/HpS+YESzae3mEJaeVZxlQK1YOyNK9D 3YEtMp7oS4Gj5UVOnwC1/nnncdhNbAO42FqGaVt1Bvk7tha+CiRbftYo6bISt9wOG0Zu 49m/73c/DBP63RfLIyAX9IUuZEjrFv1Kwv9WB6xTvKdYX3JEySa0F2wvb5juyt7hZAE0 ON3+VDiVhu5KTSZxMAr3J1bV5NZJ9Ats2V5YV1SNUiNLVgUq1grrBQ81vIE4pTcJgA6Q VWAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=gTjGw9ImztLyDWYkFo0dNEUflgDWtEiIdiP6CPvSqDM=; b=ZPJlSlNqRRBOUEIa/43bBFbYHCz9KINfhMictc3wVDvbWuqQA0UUMCHT+ncDM8egF2 ZXqEJR2OQyG0C2kYXLkRxvfr/CHuDxFVHiEzFF3VESFMSr4HuXn59nv8DQSHFs/MUK6T KvGgV3fAzBJeby0sESWcFjB8K3iOSm7G6ERH7CBBLsSrjNvtB0XlK6X6t09JGS19xHzz HqxoRMSqG5K7ZW/ubgKilLA0zeVSPWUwF/qmRGR7YabMosBRHQrePJqv5RTxJD8/Gjtr 5ynjP3XQX6xrYZ0IuI38DFMsGCE/jktlo0F11kEp8qSLssTbZZGDYuSibM8XKnpLmc5V Qlkg== X-Gm-Message-State: AOAM533AcGG9OoTuMKTeF9FrL4MNQeBFsQS5IYoDOLsXmyeI63liBj4m D9+YrEpR1qVyldH8hiXC/+d54Nl3AeI= X-Google-Smtp-Source: ABdhPJwg17+97CHQHDRnioFqCvS+QzG2nJ9WQ27LQJtstyxanlpRIZbCsLQOidvdSKpjDtlOlP/Edd0zy18= X-Received: from ascull.lon.corp.google.com ([2a00:79e0:d:109:4a0f:cfff:fe4a:6363]) (user=ascull job=sendgmr) by 2002:a0c:d443:: with SMTP id r3mr17610682qvh.17.1600166815284; Tue, 15 Sep 2020 03:46:55 -0700 (PDT) Date: Tue, 15 Sep 2020 11:46:27 +0100 In-Reply-To: <20200915104643.2543892-1-ascull@google.com> Message-Id: <20200915104643.2543892-4-ascull@google.com> Mime-Version: 1.0 References: <20200915104643.2543892-1-ascull@google.com> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v4 03/19] KVM: arm64: Remove kvm_host_data_t typedef From: Andrew Scull To: kvmarm@lists.cs.columbia.edu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_064700_708563_F9735FC9 X-CRM114-Status: GOOD ( 13.31 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:84a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, kernel-team@android.com, suzuki.poulose@arm.com, maz@kernel.org, Sudeep Holla , james.morse@arm.com, Andrew Scull , catalin.marinas@arm.com, will@kernel.org, julien.thierry.kdev@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The kvm_host_data_t typedef is used inconsistently and goes against the kernel's coding style. Remove it in favour of the full struct specifier. Signed-off-by: Andrew Scull --- arch/arm64/include/asm/kvm_host.h | 4 +--- arch/arm64/kvm/arm.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index e52c927aade5..16adbefde1cc 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -262,8 +262,6 @@ struct kvm_host_data { struct kvm_pmu_events pmu_events; }; -typedef struct kvm_host_data kvm_host_data_t; - struct vcpu_reset_state { unsigned long pc; unsigned long r0; @@ -565,7 +563,7 @@ void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome); struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr); -DECLARE_PER_CPU(kvm_host_data_t, kvm_host_data); +DECLARE_PER_CPU(struct kvm_host_data, kvm_host_data); static inline void kvm_init_host_cpu_context(struct kvm_cpu_context *cpu_ctxt) { diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 46dc3d75cf13..1af4c77feda2 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -46,7 +46,7 @@ __asm__(".arch_extension virt"); #endif -DEFINE_PER_CPU(kvm_host_data_t, kvm_host_data); +DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data); static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page); /* The VMID used in the VTTBR */ @@ -1538,7 +1538,7 @@ static int init_hyp_mode(void) } for_each_possible_cpu(cpu) { - kvm_host_data_t *cpu_data; + struct kvm_host_data *cpu_data; cpu_data = per_cpu_ptr(&kvm_host_data, cpu); err = create_hyp_mappings(cpu_data, cpu_data + 1, PAGE_HYP);