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;
MIME-Version: 1.0
References: <20210525093221.1b62a5f4@canb.auug.org.au>
In-Reply-To: <20210525093221.1b62a5f4@canb.auug.org.au>
From:   Wanpeng Li <kernellwp@gmail.com>
Date:   Tue, 25 May 2021 07:55:03 +0800
Message-ID: <CANRm+CyrwrC8ccgJo0ymQ1m9KF7XeYCwsLQewt_4w7DYZgm7nw@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the kvm-fixes tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
        Wanpeng Li <wanpengli@tencent.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, 25 May 2021 at 07:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the kvm-fixes tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> ERROR: modpost: ".kvm_vcpu_can_poll" [arch/powerpc/kvm/kvm-hv.ko] undefined!
>
> Caused by commit
>
>   0fee89fbc44b ("KVM: PPC: exit halt polling on need_resched()")

This is my fault.

From b2a6d98b48fc6b22a0b47f57a98dc3203c678195 Mon Sep 17 00:00:00 2001
From: Wanpeng Li <wanpengli@tencent.com>
Date: Tue, 25 May 2021 07:50:08 +0800
Subject: [PATCH] KVM: Fix ERROR: modpost: .kvm_vcpu_can_poll undefined!

From: Wanpeng Li <wanpengli@tencent.com>

Export kvm_vcpu_can_poll to fix ERROR: modpost: .kvm_vcpu_can_poll undefined!

Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
 virt/kvm/kvm_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 62522c1..8eaec42 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2949,6 +2949,7 @@ bool kvm_vcpu_can_poll(ktime_t cur, ktime_t stop)
 {
     return single_task_running() && !need_resched() && ktime_before(cur, stop);
 }
+EXPORT_SYMBOL_GPL(kvm_vcpu_can_poll);

 /*
  * The vCPU has executed a HLT instruction with in-kernel mode enabled.
--
2.7.4