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 D1641C433F5 for ; Wed, 16 Mar 2022 13:54:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242991AbiCPNzm (ORCPT ); Wed, 16 Mar 2022 09:55:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233718AbiCPNzj (ORCPT ); Wed, 16 Mar 2022 09:55:39 -0400 Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16B49B4E for ; Wed, 16 Mar 2022 06:54:25 -0700 (PDT) Received: from in02.mta.xmission.com ([166.70.13.52]:46178) by out01.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nUU6Z-006iY5-MH; Wed, 16 Mar 2022 07:54:23 -0600 Received: from ip68-227-174-4.om.om.cox.net ([68.227.174.4]:37928 helo=email.froward.int.ebiederm.org.xmission.com) by in02.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nUU6Y-00HDTA-AC; Wed, 16 Mar 2022 07:54:23 -0600 From: "Eric W. Biederman" To: Stephen Rothwell Cc: Ingo Molnar , Linux Kernel Mailing List , Linux Next Mailing List References: <20220316165612.4f50faad@canb.auug.org.au> Date: Wed, 16 Mar 2022 08:54:15 -0500 In-Reply-To: <20220316165612.4f50faad@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 16 Mar 2022 16:56:12 +1100") Message-ID: <871qz257g8.fsf@email.froward.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1nUU6Y-00HDTA-AC;;;mid=<871qz257g8.fsf@email.froward.int.ebiederm.org>;;;hst=in02.mta.xmission.com;;;ip=68.227.174.4;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX19wBYZXI6ToWV3riBhbTAJX534/W8fHVSg= X-SA-Exim-Connect-IP: 68.227.174.4 X-SA-Exim-Mail-From: ebiederm@xmission.com Subject: Re: linux-next: build failure after merge of the userns tree X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Hi all, > > After merging the userns tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > kernel/sched/fair.c: In function 'init_numa_balancing': > kernel/sched/fair.c:2884:9: error: implicit declaration of function 'init_task_work'; did you mean 'init_irq_work'? [-Werror=implicit-function-declaration] > 2884 | init_task_work(&p->numa_work, task_numa_work); > | ^~~~~~~~~~~~~~ > | init_irq_work > kernel/sched/fair.c: In function 'task_tick_numa': > kernel/sched/fair.c:2935:25: error: implicit declaration of function 'task_work_add' [-Werror=implicit-function-declaration] > 2935 | task_work_add(curr, work, TWA_RESUME); > | ^~~~~~~~~~~~~ > kernel/sched/fair.c:2935:51: error: 'TWA_RESUME' undeclared (first use in this function) > 2935 | task_work_add(curr, work, TWA_RESUME); > | ^~~~~~~~~~ > > Maybe caused by commit > > 03248addadf1 ("resume_user_mode: Move to resume_user_mode.h") > or > 8ca07e17c9dd ("task_work: Remove unnecessary include from posix_timers.h") Yes. That has the potential to have hidden a bug like this. > interacting with (maybe) commit > > c4ad6fcb67c4 ("sched/headers: Reorganize, clean up and optimize kernel/sched/fair.c dependencies") > > from the tip tree. > It is commit 4ff8f2ca6ccd ("sched/headers: Reorganize, clean up and optimize kernel/sched/sched.h dependencies") that ultimately removes the include of task_work.h from "sched.h". But yes ideally commit c4ad6fcb67c4 ("sched/headers: Reorganize, clean up and optimize kernel/sched/fair.c dependencies") would have added an include of task_work.h into kernel/sched/fair.c Ingo any chance you can fix this in your tree? kernel/sched/fair.c needs to include regardless. So I don't think this is a bad thing. Eric > I have applied this merge fix patch. > > From: Stephen Rothwell > Date: Wed, 16 Mar 2022 16:41:42 +1100 > Subject: [PATCH] fixup for moving of linux/task_work.h > > Signed-off-by: Stephen Rothwell > --- > kernel/sched/fair.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index 89d21fda106c..7a6678fdffb0 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -31,6 +31,7 @@ > #include > #include > #include > +#include > #include > #include > #include > -- > > 2.34.1