Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25106000 authored by Lee Schermerhorn's avatar Lee Schermerhorn Committed by Linus Torvalds
Browse files

topology: alternate fix for ia64 tiger_defconfig build breakage 



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: default avatarLee Schermerhorn <lee.schermerhorn@hp.com>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b645bd12

arch/ia64/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -499,8 +499,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

arch/ia64/kernel/smpboot.c

+0 −4
Original line number Diff line number Diff line
@@ -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();

}

include/asm-generic/topology.h

+19 −1
Original line number Diff line number Diff line
@@ -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 */

include/linux/topology.h

+0 −4
Original line number Diff line number Diff line
@@ -292,10 +292,6 @@ static inline void set_cpu_numa_mem(int cpu, int node) 


#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)