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

Commit bbf2bef9 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

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



Fix build error introduced by 3212fe15

Non-NUMA case should be handled.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a5b08073

arch/ia64/kernel/topology.c

+0 −2
Original line number Diff line number Diff line
@@ -36,9 +36,7 @@ int arch_register_cpu(int num) 
	 */

	if (!can_cpei_retarget() && is_cpu_cpei_target(num))

		sysfs_cpus[num].cpu.no_control = 1;

#ifdef CONFIG_NUMA

	map_cpu_to_node(num, node_cpuid[num].nid);

#endif

#endif



	return register_cpu(&sysfs_cpus[num].cpu, num);

include/asm-ia64/numa.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ extern void unmap_cpu_from_node(int cpu, int nid); 




#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