* linux-next: build failure in Linus' tree
@ 2010-05-28 0:57 Stephen Rothwell
2010-05-28 1:09 ` Linus Torvalds
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-05-28 0:57 UTC (permalink / raw)
To: Linus, Andrew Morton
Cc: linux-next, linux-kernel, Jack Steiner, Lee Schermerhorn
[-- Attachment #1: Type: text/plain, Size: 760 bytes --]
Hi Linus,
After merging the gcl-current tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
kernel/built-in.o: In function `.copy_process':
fork.c:(.text+0x14c34): undefined reference to `.__node_random'
fork.c:(.text+0x14c44): undefined reference to `.__node_random'
Caused by commit 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b ("cpusets:
randomize node rotor used in cpuset_mem_spread_node()").
This commit assumes that __node_random() exists if (MAX_NUMNODES > 1) and
uses it if CONFIG_CPUSETS is set, but only creates it for x86 ... there
is at least one other architecture where those conditions are true.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: build failure in Linus' tree 2010-05-28 0:57 linux-next: build failure in Linus' tree Stephen Rothwell @ 2010-05-28 1:09 ` Linus Torvalds 2010-05-30 0:43 ` Stephen Rothwell 0 siblings, 1 reply; 6+ messages in thread From: Linus Torvalds @ 2010-05-28 1:09 UTC (permalink / raw) To: Stephen Rothwell Cc: Andrew Morton, linux-next, linux-kernel, Jack Steiner, Lee Schermerhorn On Fri, 28 May 2010, Stephen Rothwell wrote: > > Caused by commit 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b ("cpusets: > randomize node rotor used in cpuset_mem_spread_node()"). > > This commit assumes that __node_random() exists if (MAX_NUMNODES > 1) and > uses it if CONFIG_CPUSETS is set, but only creates it for x86 ... there > is at least one other architecture where those conditions are true. Yeah, looking at that, it seems totally idiotic. Why is that "__node_random()" in x86 code at all? There is absolutely nothing x86 about it that I can tell. And now I have an ia64 merge that just duplicates that moronic function. Linus ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure in Linus' tree 2010-05-28 1:09 ` Linus Torvalds @ 2010-05-30 0:43 ` Stephen Rothwell 2010-06-01 17:04 ` Tony Luck 0 siblings, 1 reply; 6+ messages in thread From: Stephen Rothwell @ 2010-05-30 0:43 UTC (permalink / raw) To: Linus Torvalds Cc: Andrew Morton, linux-next, linux-kernel, Jack Steiner, Lee Schermerhorn [-- Attachment #1: Type: text/plain, Size: 1173 bytes --] Hi Linus, On Thu, 27 May 2010 18:09:17 -0700 (PDT) Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Fri, 28 May 2010, Stephen Rothwell wrote: > > > > Caused by commit 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b ("cpusets: > > randomize node rotor used in cpuset_mem_spread_node()"). > > > > This commit assumes that __node_random() exists if (MAX_NUMNODES > 1) and > > uses it if CONFIG_CPUSETS is set, but only creates it for x86 ... there > > is at least one other architecture where those conditions are true. > > Yeah, looking at that, it seems totally idiotic. > > Why is that "__node_random()" in x86 code at all? There is absolutely > nothing x86 about it that I can tell. And now I have an ia64 merge that > just duplicates that moronic function. So, is it reasonable for me to ask you to revert commit 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b ("cpusets: randomize node rotor used in cpuset_mem_spread_node()")? Reverting it won't break ia64 (since their fix was to just add code that would then be unreferenced). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure in Linus' tree 2010-05-30 0:43 ` Stephen Rothwell @ 2010-06-01 17:04 ` Tony Luck 2010-06-01 17:07 ` Linus Torvalds 2010-06-11 18:25 ` [PATCH] Alternate fix for ia64 tiger_defconfig build breakage Lee Schermerhorn 0 siblings, 2 replies; 6+ messages in thread From: Tony Luck @ 2010-06-01 17:04 UTC (permalink / raw) To: Stephen Rothwell Cc: Linus Torvalds, Andrew Morton, linux-next, linux-kernel, Jack Steiner, Lee Schermerhorn On Sat, May 29, 2010 at 5:43 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > So, is it reasonable for me to ask you to revert commit > 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b ("cpusets: randomize node rotor > used in cpuset_mem_spread_node()")? Reverting it won't break ia64 (since > their fix was to just add code that would then be unreferenced). If that's the way you go - then just revert commit 4ec37de89d8c758ee8115e0e64b3f994910789ee too. I only put that in to get the ia64 build working when 0ac0c0d went upstream. -Tony ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure in Linus' tree 2010-06-01 17:04 ` Tony Luck @ 2010-06-01 17:07 ` Linus Torvalds 2010-06-11 18:25 ` [PATCH] Alternate fix for ia64 tiger_defconfig build breakage Lee Schermerhorn 1 sibling, 0 replies; 6+ messages in thread From: Linus Torvalds @ 2010-06-01 17:07 UTC (permalink / raw) To: Tony Luck Cc: Stephen Rothwell, Andrew Morton, linux-next, linux-kernel, Jack Steiner, Lee Schermerhorn On Tue, 1 Jun 2010, Tony Luck wrote: > On Sat, May 29, 2010 at 5:43 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > So, is it reasonable for me to ask you to revert commit > > 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b ("cpusets: randomize node rotor > > used in cpuset_mem_spread_node()")? Reverting it won't break ia64 (since > > their fix was to just add code that would then be unreferenced). > > If that's the way you go - then just revert commit > 4ec37de89d8c758ee8115e0e64b3f994910789ee > too. I only put that in to get the ia64 build working > when 0ac0c0d went upstream. I did. See commit b3f2f6cd1ff935ecac9a5346904b899d7af689fe. Although I left the non-__node_random parts, which seemed to be an independent compile fix. Linus ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Alternate fix for ia64 tiger_defconfig build breakage 2010-06-01 17:04 ` Tony Luck 2010-06-01 17:07 ` Linus Torvalds @ 2010-06-11 18:25 ` Lee Schermerhorn 1 sibling, 0 replies; 6+ messages in thread From: Lee Schermerhorn @ 2010-06-11 18:25 UTC (permalink / raw) To: Tony Luck, Linus Torvalds, Andrew Morton; +Cc: linux-kernel Offered as an alternative to Tony's in-line #ifdefs to address the ia64 non-numa build breakage. Lee ----------------------------------- Define stubs for the numa_*_id() generic percpu related functions for non-NUMA configurations in <asm-generic/topology.h> where the other non-numa stubs live. Fixes ia64 !NUMA build breakage -- e.g., tiger_defconfig Back out now unneeded '#ifndef CONFIG_NUMA' guards from ia64 smpboot.c Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com> arch/ia64/Kconfig | 3 +-- arch/ia64/kernel/smpboot.c | 4 ---- include/asm-generic/topology.h | 20 +++++++++++++++++++- include/linux/topology.h | 4 ---- 4 files changed, 20 insertions(+), 11 deletions(-) Index: linux-2.6.35-rc2/include/asm-generic/topology.h =================================================================== --- linux-2.6.35-rc2.orig/include/asm-generic/topology.h +++ linux-2.6.35-rc2/include/asm-generic/topology.h @@ -5,7 +5,7 @@ * * Copyright (C) 2002, IBM Corp. * - * All rights reserved. + * All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,9 +34,16 @@ #ifndef cpu_to_node #define cpu_to_node(cpu) ((void)(cpu),0) #endif +#ifndef set_numa_node +#define set_numa_node(node) +#endif +#ifndef set_cpu_numa_node +#define set_cpu_numa_node(cpu, node) +#endif #ifndef cpu_to_mem #define cpu_to_mem(cpu) ((void)(cpu),0) #endif + #ifndef parent_node #define parent_node(node) ((void)(node),0) #endif @@ -55,4 +62,15 @@ #endif /* CONFIG_NUMA */ +#if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES) + +#ifndef set_numa_mem +#define set_numa_mem(node) +#endif +#ifndef set_cpu_numa_mem +#define set_cpu_numa_mem(cpu, node) +#endif + +#endif /* !CONFIG_NUMA || !CONFIG_HAVE_MEMORYLESS_NODES */ + #endif /* _ASM_GENERIC_TOPOLOGY_H */ Index: linux-2.6.35-rc2/arch/ia64/Kconfig =================================================================== --- linux-2.6.35-rc2.orig/arch/ia64/Kconfig +++ linux-2.6.35-rc2/arch/ia64/Kconfig @@ -503,8 +503,7 @@ config USE_PERCPU_NUMA_NODE_ID depends on NUMA config HAVE_MEMORYLESS_NODES - def_bool y - depends on NUMA + def_bool NUMA config ARCH_PROC_KCORE_TEXT def_bool y Index: linux-2.6.35-rc2/include/linux/topology.h =================================================================== --- linux-2.6.35-rc2.orig/include/linux/topology.h +++ linux-2.6.35-rc2/include/linux/topology.h @@ -291,10 +291,6 @@ static inline void set_cpu_numa_mem(int #else /* !CONFIG_HAVE_MEMORYLESS_NODES */ -static inline void set_numa_mem(int node) {} - -static inline void set_cpu_numa_mem(int cpu, int node) {} - #ifndef numa_mem_id /* Returns the number of the nearest Node with memory */ static inline int numa_mem_id(void) Index: linux-2.6.35-rc2/arch/ia64/kernel/smpboot.c =================================================================== --- linux-2.6.35-rc2.orig/arch/ia64/kernel/smpboot.c +++ linux-2.6.35-rc2/arch/ia64/kernel/smpboot.c @@ -390,13 +390,11 @@ smp_callin (void) fix_b0_for_bsp(); -#ifdef CONFIG_NUMA /* * numa_node_id() works after this. */ set_numa_node(cpu_to_node_map[cpuid]); set_numa_mem(local_memory_node(cpu_to_node_map[cpuid])); -#endif ipi_call_lock_irq(); spin_lock(&vector_lock); @@ -640,9 +638,7 @@ void __devinit smp_prepare_boot_cpu(void { cpu_set(smp_processor_id(), cpu_online_map); cpu_set(smp_processor_id(), cpu_callin_map); -#ifdef CONFIG_NUMA set_numa_node(cpu_to_node_map[smp_processor_id()]); -#endif per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; paravirt_post_smp_prepare_boot_cpu(); } ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-06-11 18:25 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-05-28 0:57 linux-next: build failure in Linus' tree Stephen Rothwell 2010-05-28 1:09 ` Linus Torvalds 2010-05-30 0:43 ` Stephen Rothwell 2010-06-01 17:04 ` Tony Luck 2010-06-01 17:07 ` Linus Torvalds 2010-06-11 18:25 ` [PATCH] Alternate fix for ia64 tiger_defconfig build breakage Lee Schermerhorn
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®