Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1599139ybb; Thu, 26 Mar 2020 03:59:48 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvXIvI/16qUHbfWAJvynZFVlQl6hBGLMHnBAQLlBvpIwNNXzqrsPIvdp9Oc6PF9/2feFhz+ X-Received: by 2002:a05:6830:4025:: with SMTP id i5mr5997667ots.203.1585220388829; Thu, 26 Mar 2020 03:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585220388; cv=none; d=google.com; s=arc-20160816; b=lFVLPoovDoHCmDj1yJFJK6gx4rA2lhqF/Prr8+ImJeT2uQ7YB2NJzAa2TIPHZlPgVu 6ENOoHrESsiDJCzsltYiegGjwJrDqrpge4qRhLF3iL6KdiB2exhZkOfc9KBXrV7Anm34 hcDAfqPTneWYNBRcwpzrVbHz8DLuAUvlx2dXsCnCcl4+Yi49uayALY1Pg8HlBLXROuzD KJ8r3DhcjdMs7sXxRYcbHloTF37VG5dX6cjkh8O53dzcYKzyV03IhgELjhUcGPtFj4UL Nc7FyZVNJNos52bcUHkZXDIEAkFQ44dxK3C4aiL/KrZmAJht3Oiza9zevvz2uYYxc6tB rO0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=EJH64rYvwVEKtmem6l3uqpDYXyUY0osqNTWpJ5wEKSI=; b=Y5Ek8kTYUtKehzL1yGGdWdWCvWtaB2UhxpAka4nlvrEyuRwuuZhd1ePFPpqjDR5M1L /oef9uJWRXAuaUn4gf9a4nmN5V7RpH1tqBUmkMkGhM2tHct4UMlsw1Hm97R3Jn9UR/DD 6jisZE296V6X+CpKDaBhw8bOURew8x7OuSQg/JbeXjtFhedeLpbk1EA+0kA54Kq0RDZv NIdo7zw2W0HhILApYe9egwaAoMR05Ku1FE/030DZ1c+0/8YGi+Hc8bTgdnoV3TyrxBBB iKOebX7JggKakY/KBtb/xcJIOsP1GKvSf9rEtXmyW2a9KkFoKvQLDc2/ev79zADN/VpS 2Scg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si922210oto.260.2020.03.26.03.59.35; Thu, 26 Mar 2020 03:59:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727953AbgCZK7O (ORCPT + 99 others); Thu, 26 Mar 2020 06:59:14 -0400 Received: from foss.arm.com ([217.140.110.172]:59034 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727590AbgCZK7N (ORCPT ); Thu, 26 Mar 2020 06:59:13 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 23C077FA; Thu, 26 Mar 2020 03:59:13 -0700 (PDT) Received: from e107158-lin (e107158-lin.cambridge.arm.com [10.1.195.21]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DFDB73F71F; Thu, 26 Mar 2020 03:59:11 -0700 (PDT) Date: Thu, 26 Mar 2020 10:59:09 +0000 From: Qais Yousef To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Sebastian Reichel , Linux Next Mailing List , Linux Kernel Mailing List , Baolin Wang Subject: Re: linux-next: build failure after merge of the tip tree Message-ID: <20200326105908.enebu3x4lmdvwnnf@e107158-lin> References: <20200326135258.2764f0de@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200326135258.2764f0de@canb.auug.org.au> User-Agent: NeoMutt/20171215 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen On 03/26/20 13:52, Stephen Rothwell wrote: > Hi all, > > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/power/reset/sc27xx-poweroff.c: In function 'sc27xx_poweroff_shutdown': > drivers/power/reset/sc27xx-poweroff.c:38:4: error: implicit declaration of function 'cpu_down' [-Werror=implicit-function-declaration] > 38 | cpu_down(cpu); > | ^~~~~~~~ > > Caused by commit > > 33c3736ec888 ("cpu/hotplug: Hide cpu_up/down()") > > interacting with commit > > 274afbc3ad33 ("power: reset: sc27xx: Change to use cpu_down()") > > from the battery tree. > > I have added the following merge fix patch: Your merge fix looks correct. Though the original code is missing error handling if offlining the cpu failed for one reason or another. I don't know the details, but something feels off about the driver having to bring cpus down. Thanks -- Qais Yousef > > From: Stephen Rothwell > Date: Thu, 26 Mar 2020 13:42:00 +1100 > Subject: [PATCH] power: reset: sc27xx: use remove_cpu instead of cpu_down > > Signed-off-by: Stephen Rothwell > --- > drivers/power/reset/sc27xx-poweroff.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/power/reset/sc27xx-poweroff.c b/drivers/power/reset/sc27xx-poweroff.c > index 69863074daf6..90287c31992c 100644 > --- a/drivers/power/reset/sc27xx-poweroff.c > +++ b/drivers/power/reset/sc27xx-poweroff.c > @@ -35,7 +35,7 @@ static void sc27xx_poweroff_shutdown(void) > > for_each_online_cpu(cpu) { > if (cpu != smp_processor_id()) > - cpu_down(cpu); > + remove_cpu(cpu); > } > #endif > } > -- > 2.25.0 > > -- > Cheers, > Stephen Rothwell