From patchwork Thu Jan 19 18:21:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 45895 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp481392wrn; Thu, 19 Jan 2023 10:32:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXt6HcitbF+XTepWtRq2Zvmlhm9arcznpmVByG6jcfavyV+bNv+3Xt1prhyKAoMsrK8EzwVC X-Received: by 2002:a17:90b:2681:b0:228:f6c1:9fa3 with SMTP id pl1-20020a17090b268100b00228f6c19fa3mr12149823pjb.8.1674153164657; Thu, 19 Jan 2023 10:32:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674153164; cv=none; d=google.com; s=arc-20160816; b=b+7bequHd4l/nygLYhLKJDbE6rBfNNVpvnWBvR7ZRimTVDEDLfuR50M4ubKJMhAwys YzcT5P76cAXgLZt9O52PZv/EARYhBiOywGw6WUb6B7T7nvPlhZd0eRrjz4Efe7fu9h3a PS60Al546JgxeJYcXl6HYZAcw1k+CsruiDRFfUhsZ8s/LKiADYGT/SWM7n3DoIB5vgEm fFrX1WGVF5yy3EiYLgY6kTwTVYw121qNLcSBvF/AIgn7uC6a+tWLRTq+zlcSedf8lKqE xLALwTXpjQDjFDxHOQxg5RmmB2LuwT3yn0mxnX/49F4BeL8FDnU6ah7Lo5yvQGmANxBc JMeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :reply-to:dkim-signature; bh=b40fwcC6nngRFLft6op27vX6xZWPu1WE1VJnXnClKPs=; b=Qq2ES2KyMJ9YpuZGjuI+Q4xnXqq3bynDV23t40Z3klGMnMUSrDRbRo1LPj9lYUOMzT 2xY5JWD4ZRVFxGHfvHJKSnY6awrYSklqJVU3YmRX8hDDDmkdy+hVq6RAtoCGPAeDGDeA ahqlvP5+f584CSJLgto8AtYpavTAdJY6vpgUzu+Q6P6fauqdzsbpb0ouywxGwmAdUqs5 2LggkqhydigJ0BL5HuwNrv5Hz8senhNccc+sa35fi3Bf8djp/KBrU+dMyZtr7xb5J39L NyPAaY3NttMOfqaJzS2GeRkg5ooWF6rfvAUxjQks8MGGhc+Gpph6xmsUvfaH8cl9IOrv i0BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=lPgJ+psv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lp1-20020a17090b4a8100b00229538b08b0si6465009pjb.87.2023.01.19.10.32.33; Thu, 19 Jan 2023 10:32:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=lPgJ+psv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229459AbjASSWF (ORCPT + 99 others); Thu, 19 Jan 2023 13:22:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbjASSWE (ORCPT ); Thu, 19 Jan 2023 13:22:04 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12B3B90B18 for ; Thu, 19 Jan 2023 10:22:03 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id pa16-20020a17090b265000b0020a71040b4cso1413740pjb.6 for ; Thu, 19 Jan 2023 10:22:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=b40fwcC6nngRFLft6op27vX6xZWPu1WE1VJnXnClKPs=; b=lPgJ+psvO0gs4F1pC7Vb9jyNcokvbED/nE4sfWUC7tB5g/4OxeLVT56AIJY01cJgOa EsCnN99LLBE77rh51iBGQNmTyTMhzT9Q9FXaxFpsnDNXG6uBzHfYFnmn0L71YgUiJXoc c+zkoS9FEo1pdbW3YSuO1zXz2IfLOGyzmNyxUAAuJ+K5nq5LxCtwyPkA8enNIr2OCPsk UryVt6qYaPlTl4yVAGsh+H/ZyE5tYIy6BXXfV0oOTJEdOlMUAx2yMGvvB/wSYcPdSP6L StepHpLKdkdeMUQWM3xGseB1/PNRmD7Zv9Ga/E8KfpFdmBQp60J+aUm2uoMumiPLQQdB zXXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=b40fwcC6nngRFLft6op27vX6xZWPu1WE1VJnXnClKPs=; b=68Ei/4bBqZk2ktp9FDPD2JV/fn2XVjcs023XpztwWuIubIpRKYdB3cM2kaBQ9OOo6E o7AsDl/OK6MzsU7k4FTYhCct3LW07oLM5L9nhqjV5eNI/RRXavC8nMaAn4bze4J39k46 Z2jeGh76i6XHPIiySKLU9qWqIpVKdlarfVnaFueSW/k0cRqs42SlN1eAx+ePrcAK4tW5 EK4H5DpiP20gbem8C2ej/vCEJaWGZa/VsJQFfzeu/jjsjmSB9XOMJoFfd8RIwSOsq5TN 2D4InLRQBOLW5L2GuXzid5mSix48nNre9z8sCDkzpKz+GSduzsT6bfcnpIEf05t+cw2M BQeA== X-Gm-Message-State: AFqh2krtE4TDawwArW/FxgqpWByClpgQJxyc5oBbiYhL0wU6XGD6cGhk apm9kUKm/XHN7CPKx6J3c+Dudn36PXw= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:4e87:0:b0:58d:8d29:399c with SMTP id c129-20020a624e87000000b0058d8d29399cmr1071733pfb.44.1674152522508; Thu, 19 Jan 2023 10:22:02 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 19 Jan 2023 18:21:58 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.0.246.g2a6d74b583-goog Message-ID: <20230119182158.4026656-1-seanjc@google.com> Subject: [PATCH] KVM: PPC: Fix refactoring goof in kvmppc_e500mc_init() From: Sean Christopherson To: Paolo Bonzini Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Michael Ellerman , Sean Christopherson X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755476828563716205?= X-GMAIL-MSGID: =?utf-8?q?1755476828563716205?= Fix a build error due to a mixup during a recent refactoring. The error was reported during code review, but the fixed up patch didn't make it into the final commit. Fixes: 474856bad921 ("KVM: PPC: Move processor compatibility check to module init") Link: https://lore.kernel.org/all/87cz93snqc.fsf@mpe.ellerman.id.au Cc: Michael Ellerman Signed-off-by: Sean Christopherson --- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/kvm/e500mc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) base-commit: 91dc252b0dbb6879e4067f614df1e397fec532a1 diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 7b4920e9fd26..a647bfc322b8 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -1208,7 +1208,7 @@ int kvmppc_handle_exit(struct kvm_vcpu *vcpu, unsigned int exit_nr) /* * On cores with Vector category, KVM is loaded only if CONFIG_ALTIVEC, - * see kvmppc_core_check_processor_compat(). + * see kvmppc_e500mc_check_processor_compat(). */ #ifdef CONFIG_ALTIVEC case BOOKE_INTERRUPT_ALTIVEC_UNAVAIL: diff --git a/arch/powerpc/kvm/e500mc.c b/arch/powerpc/kvm/e500mc.c index 611532a0dedc..a309138927ff 100644 --- a/arch/powerpc/kvm/e500mc.c +++ b/arch/powerpc/kvm/e500mc.c @@ -168,7 +168,7 @@ static void kvmppc_core_vcpu_put_e500mc(struct kvm_vcpu *vcpu) kvmppc_booke_vcpu_put(vcpu); } -int kvmppc_core_check_processor_compat(void) +int kvmppc_e500mc_check_processor_compat(void) { int r; @@ -390,7 +390,7 @@ static int __init kvmppc_e500mc_init(void) r = kvmppc_e500mc_check_processor_compat(); if (r) - return kvmppc_e500mc; + goto err_out; r = kvmppc_booke_init(); if (r)