evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] fix "cpu to node relationship fixup: map cpu to node"

Browse source 
Fix build error introduced by 3212fe1594

Non-NUMA case should be handled.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
KAMEZAWA Hiroyuki 2006-09-27 01:49:25 -07:00 • committed by Linus Torvalds
parent a5b08073a0
commit bbf2bef9f5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/ia64/kernel/topology.c
View file

@ -36,9 +36,7 @@ int arch_register_cpu(int num)
*/ */
if (!can_cpei_retarget() && is_cpu_cpei_target(num)) if (!can_cpei_retarget() && is_cpu_cpei_target(num))
sysfs_cpus[num].cpu.no_control = 1; sysfs_cpus[num].cpu.no_control = 1;
#ifdef CONFIG_NUMA
map_cpu_to_node(num, node_cpuid[num].nid); map_cpu_to_node(num, node_cpuid[num].nid);
#endif
#endif #endif
return register_cpu(&sysfs_cpus[num].cpu, num); return register_cpu(&sysfs_cpus[num].cpu, num);

2
include/asm-ia64/numa.h
View file

@ -69,6 +69,8 @@ extern void unmap_cpu_from_node(int cpu, int nid);
#else /* !CONFIG_NUMA */ #else /* !CONFIG_NUMA */
#define map_cpu_to_node(cpu, nid) do{}while(0)
#define unmap_cpu_from_node(cpu, nid) do{}while(0)
#define paddr_to_nid(addr) 0 #define paddr_to_nid(addr) 0