From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6335C433F5 for ; Mon, 13 Dec 2021 17:30:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240723AbhLMRal (ORCPT ); Mon, 13 Dec 2021 12:30:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237624AbhLMRal (ORCPT ); Mon, 13 Dec 2021 12:30:41 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D719C06173F for ; Mon, 13 Dec 2021 09:30:41 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id x7so12391653pjn.0 for ; Mon, 13 Dec 2021 09:30:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=JLl9NBjWhC8ycFWNbwA1xe7cz0lo/vfYPVBrYSBn0zQ=; b=kHQfPRtJy95Q3BTzS0nITHh7PKHGRCYTW7MbSbqmRtJPWWv96ES5/2t3Nyx6lMjnL1 NmKrHkpIG5YHkWb+py2doU5OzOS1Pjt1xdAKGaKT4KeEOfDq1koiO6J+/g7iIDe8tfy/ Morf2+k56PdVNWRQA0ipFSu8z5LiVfu8tdNebySj/Osc0f5rVwqOmeBJFq1p2R5OgKIb +Gg9VdpL3GfYrozJQWFPRlavhlmhZ1BetwAuuXB74BS6rvqTCsGp6gNUf+cU70gQZYW+ MbU/B7aNM+8fzfBFVyE3S5s1IMFd9HZW5PfsUxOrxYlKNFLOxjebCWfHS+QCsn46vfjd DT0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=JLl9NBjWhC8ycFWNbwA1xe7cz0lo/vfYPVBrYSBn0zQ=; b=PHo1zXKD/yK+7E+co6/Oxi0EiMaYc8h4McUx6sZ/6PmoKTFp5MDEsYXyHtk2v+rX8p CsknK4SnTZNNFIaSyKqpwufh87nlYW+YJfgdtdD2eDfqQjWWYCK2xpJLRGYc8grLUe1j hQB2uYt0sdowCWp5R8iO+7/Vnc9QenuH8MsBZmas9pMoCbvT0VMKCUxLWCvxiq1mj+k+ 6tWAwXdC+DUwS/mNiXh5sAzu+l32kJrU/sYPs2HC8ABi3q/0yTUp3Tjh67iG3k28EX57 h98Pxuuggp4HeGw42fPGr4UR08d9g8Q72nhSpprwUVv89ASTmlmW1CJaJ8x0WfTdK9oK DTFQ== X-Gm-Message-State: AOAM530vS4ExgimZ9ffvaIYg9zrpe8EWuUbTvAbqESujt2M/AXJ+Q9Cc 3yam+fZ7gxTjclSNu92lWO8XBO5mdgP0WA== X-Google-Smtp-Source: ABdhPJyB2C91wLSzzIMpfR+iEbCKqIGvUxk0irgmd2CZCEZjmCAgPiOl9dvAamgDlWeyfWdcv2KWvw== X-Received: by 2002:a17:90b:4c03:: with SMTP id na3mr45572990pjb.62.1639416640628; Mon, 13 Dec 2021 09:30:40 -0800 (PST) Received: from google.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h8sm14368696pfh.10.2021.12.13.09.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 09:30:40 -0800 (PST) Date: Mon, 13 Dec 2021 17:30:36 +0000 From: Sean Christopherson To: Sachin Sant Cc: kvm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org Subject: Re: [next-20211210] Build break powerpc/kvm: unknown member wait Message-ID: References: <496ECBB3-36F3-4F07-83B2-875F683BC446@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <496ECBB3-36F3-4F07-83B2-875F683BC446@linux.vnet.ibm.com> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Sat, Dec 11, 2021, Sachin Sant wrote: > next-20211210 ( commit ea922272cbe547) powerpc build fails due to following error: > > arch/powerpc/kvm/book3s_hv.c: In function 'kvmhv_run_single_vcpu': > arch/powerpc/kvm/book3s_hv.c:4591:27: error: 'struct kvm_vcpu' has no member named 'wait' > prepare_to_rcuwait(&vcpu->wait); > ^~ > arch/powerpc/kvm/book3s_hv.c:4608:23: error: 'struct kvm_vcpu' has no member named 'wait' > finish_rcuwait(&vcpu->wait); > ^~ > > commit 510958e997217: KVM: Force PPC to define its own rcuwait object > introduced the error. This is a silent merge conflict between the above commit in the KVM tree and commit ecb6a7207f92 ("KVM: PPC: Book3S HV P9: Remove most of the vcore logic") in the PPC tree. I'll send a patch for the PPC tree that is resolves the issue and is a standalone cleanup.