From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"David S. Miller" <davem@davemloft•net>
Subject: linux-next: build failure after merge of the final tree (tip tree related)
Date: Tue, 12 Apr 2011 14:00:40 +1000 [thread overview]
Message-ID: <20110412140040.3020ef55.sfr@canb.auug.org.au> (raw)
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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
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];
+}
#endif /* _ASM_SPARC64_TOPOLOGY_H */
--
1.7.4.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2011-04-12 4:00 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-12 4:00 Stephen Rothwell [this message]
2011-04-12 6:20 ` linux-next: build failure after merge of the final tree (tip tree related) Ingo Molnar
2011-04-12 6:25 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2010-11-29 2:50 Stephen Rothwell
2010-11-29 22:30 ` Peter Zijlstra
2010-12-07 1:56 ` Stephen Rothwell
2010-11-22 2:39 Stephen Rothwell
2010-11-22 22:00 ` Don Zickus
2010-11-29 2:50 ` Stephen Rothwell
2010-11-29 8:29 ` Ingo Molnar
2010-11-29 14:30 ` Don Zickus
2010-12-07 1:58 ` Stephen Rothwell
2010-12-07 15:37 ` Don Zickus
2010-10-14 5:49 Stephen Rothwell
2010-10-14 6:31 ` Ingo Molnar
2010-09-13 14:29 Stephen Rothwell
2010-09-16 6:32 ` Stephen Rothwell
2010-09-16 6:39 ` Ingo Molnar
2010-09-16 7:08 ` Russell King - ARM Linux
2010-09-16 7:34 ` Ingo Molnar
2010-09-16 9:02 ` Russell King - ARM Linux
2010-09-16 7:09 ` Stephen Rothwell
2010-09-16 7:20 ` Yinghai Lu
2010-09-16 7:27 ` Stephen Rothwell
2010-09-13 14:06 Stephen Rothwell
2010-09-13 19:17 ` Matt Fleming
2010-09-13 19:22 ` Peter Zijlstra
2010-08-02 16:23 Stephen Rothwell
2010-08-02 16:28 ` Russell King
2010-08-02 16:32 ` H. Peter Anvin
2010-08-03 1:07 ` Benjamin Herrenschmidt
2010-08-03 1:42 ` Benjamin Herrenschmidt
2010-08-03 3:13 ` H. Peter Anvin
2010-08-03 4:32 ` Benjamin Herrenschmidt
2010-08-03 5:29 ` Ingo Molnar
2010-08-02 16:28 ` Stephen Rothwell
2010-08-03 1:41 ` Benjamin Herrenschmidt
2010-06-23 16:31 Stephen Rothwell
2010-06-23 16:55 ` Frederic Weisbecker
2010-06-23 23:31 ` Stephen Rothwell
2010-06-24 0:37 ` Stephen Rothwell
2010-06-23 0:50 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110412140040.3020ef55.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox