From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756648Ab1DLGUV (ORCPT ); Tue, 12 Apr 2011 02:20:21 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:60857 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754504Ab1DLGUU (ORCPT ); Tue, 12 Apr 2011 02:20:20 -0400 Date: Tue, 12 Apr 2011 08:20:02 +0200 From: Ingo Molnar To: Stephen Rothwell , "David S. Miller" Cc: Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: build failure after merge of the final tree (tip tree related) Message-ID: <20110412062002.GA31050@elte.hu> References: <20110412140040.3020ef55.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110412140040.3020ef55.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-08-17) X-ELTE-SpamScore: -2.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.3.1 -2.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (sparc64 defconfig) > failed like this: > > kernel/sched.c:7140: error: 'cpu_coregroup_mask' undeclared here (not in a function) > > Caused by commit 2c402dc3bb50 ("sched: Unify the sched_domain build > functions"). On sparc64, cpu_coregroup_mask is a #define, not a function. > > I applied tha patch below (idea stolen from s390) whcih could probably be > better. > > From: Stephen Rothwell > Date: Tue, 12 Apr 2011 13:51:32 +1000 > Subject: [PATCH] sched: fix sparc64 for sched_domain changes > > Fixes this compile error: > > kernel/sched.c:7140: error: 'cpu_coregroup_mask' undeclared here (not in a function) > > Signed-off-by: Stephen Rothwell > --- > arch/sparc/include/asm/topology_64.h | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h > index 1c79f32..16f477d 100644 > --- a/arch/sparc/include/asm/topology_64.h > +++ b/arch/sparc/include/asm/topology_64.h > @@ -65,6 +65,10 @@ static inline int pcibus_to_node(struct pci_bus *pbus) > #define smt_capable() (sparc64_multi_core) > #endif /* CONFIG_SMP */ > > -#define cpu_coregroup_mask(cpu) (&cpu_core_map[cpu]) > +extern cpumask_t cpu_core_map[NR_CPUS]; > +static inline const struct cpumask *cpu_coregroup_mask(int cpu) > +{ > + return &cpu_core_map[cpu]; > +} Dave, if this change is fine with you i'd like to queue it up in tip:sched/domains. Thanks, Ingo