A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-31 12:10:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

topology: alternate fix for ia64 tiger_defconfig build breakage

Browse source 
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 <[email protected]>
Tested-by: Tony Luck <[email protected]>
Acked-by: Tony Luck <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Lee Schermerhorn 2010-08-09 17:19:00 -07:00 • committed by Linus Torvalds
commit 2510600060
4 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/ia64/Kconfig
View file

@ -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

4
arch/ia64/kernel/smpboot.c
View file

@ -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();
}