From patchwork Thu Aug 20 10:34:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Scull X-Patchwork-Id: 11726011 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 EE7E915E4 for ; Thu, 20 Aug 2020 10:35:50 +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 C6D302078D for ; Thu, 20 Aug 2020 10:35:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LUfZwKzt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="OL1FdvQ0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6D302078D 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=mod6DNA1kErbXeRHNCk+M0PI2aWRVjjnNiHMGoT5Vdg=; b=LUfZwKztlfVI2608zB+4YMjOn BkeYORSGne0cZC+OfVxi0TLxfpfEUUtvIymdUcd0B0sYdSgZYcVROfO5zanE2tTiTTPAYNYnzANNv eGghzMikzMSqFoEmDwoK5VJRQrjDHYwTtEPF7FdV4RVCD81YgFMROEUf7ryXcZJHmp9yuZQ71QPF9 bHWEC42a5XvpQ76WwhEioHHusic8ePsCMonk0u9tGQyVLwmUnN5xRIw/Ff4q7SmBDNv3W/vQELY8j hLd89KTzbE69ihxElYoH8FbcyvkHUrB7qyjE2cSbhnzo8XTJWWLwUaNWV+jIsEKpBJNyPyZX/AX0R 7LrKqXBMw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8huz-00020y-Gy; Thu, 20 Aug 2020 10:35:37 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8hur-0001yG-AZ for linux-arm-kernel@lists.infradead.org; Thu, 20 Aug 2020 10:35:29 +0000 Received: by mail-wr1-x44a.google.com with SMTP id k11so508159wrv.1 for ; Thu, 20 Aug 2020 03:35:27 -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=NpTWAfUuaBrqvL5WoiOglVAHXJmeF/kvgd4T1sm4uCk=; b=OL1FdvQ06po5dRDgFoBC/jhuI9HcHJKKWdkz/lBUsb9qgzZ/ePBm+EmvUdZApEWkJl DEioStqoOMXFtmrk1ZntjTWn3Mq2+/KxLIdjT1OUh3v5kYt9ck8JEqKVjhJZRTYRltH/ 90/p3dMMbiTts6AcHML6rMoWC/lgWvl5NKbUbsLhEUZV9Ud3KOkWj3kEmzPz2KCbUSvR oj+XwjW2BhO/TtksYSGgW4TCo/fkTpp/4HbGmrJNm6oH3/Hut+BtZnEDVZgs13VvLj7m tjUPnZ/Jt/R3+8sRMEzzuY8sZtdHTOT8r1Q/KZNS47k4/BTsFY1ex9HL3p/4HOpgv8F8 AjDw== 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=NpTWAfUuaBrqvL5WoiOglVAHXJmeF/kvgd4T1sm4uCk=; b=eyjlzwX4+qZAO+Www9Gw+ebETuNIO5OROIAhT8zAmio+DXuuyXlXwZlVF+bhwxmuys v2CjKd6vr9l+o8t64o8S9c+0/IsZrNlXHHoQIf/vit9fg9t5g/fwQJtnxOeHsZpjvIvL YsBtiUdhhs91991MNRhRjj2GYtMdStVVMNOl+riuZ9DNEbdEoK8Ansl+SrYmQxPPVwL/ 7poAAfTo9pLwcwVsCnwbI6bqJNtk5xka0t9coA5BhXJeZPHYfh1yQS+0fKOnulFtRQhe OqtXS4BXcMqsgLsr422lRZWNqv1TzurPr6Q0D35shB0T06BB4btZRM3vPI62cL1Dd6Hz jTvA== X-Gm-Message-State: AOAM531V2RdIbZLc+LHh+BfiqAQqglmp3FXgIKX78db44a9JUj/24Koa gY/5OEejtk2+OS7M7JyyaDO2jpwph1E= X-Google-Smtp-Source: ABdhPJzbph0gXnRJBKxFt0tc/NsFuKkkl/5TPKx7o/izNImFpUzaCaoSh4wqoPNsXOB90sybT/1JE7x91o4= X-Received: from ascull.lon.corp.google.com ([2a00:79e0:d:109:4a0f:cfff:fe4a:6363]) (user=ascull job=sendgmr) by 2002:adf:bb83:: with SMTP id q3mr2798288wrg.58.1597919726837; Thu, 20 Aug 2020 03:35:26 -0700 (PDT) Date: Thu, 20 Aug 2020 11:34:29 +0100 In-Reply-To: <20200820103446.959000-1-ascull@google.com> Message-Id: <20200820103446.959000-4-ascull@google.com> Mime-Version: 1.0 References: <20200820103446.959000-1-ascull@google.com> X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH v2 03/20] 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-20200820_063529_376498_5E9B0C22 X-CRM114-Status: GOOD ( 12.94 ) 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 [2a00:1450:4864:20:0:0:0:44a listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -0.0 SPF_PASS SPF: sender matches SPF record 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_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from 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 65568b23868a..ec1a80796999 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 691d21e4c717..6b09c0f3365c 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);