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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Fix build error introduced by 3212fe1594e577463bc8601d28aa008f520c3377

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>

authored by

KAMEZAWA Hiroyuki and committed by

Linus Torvalds 19 years ago bbf2bef9 a5b08073

+2 -2

2 changed files

expand all

arch

ia64

kernel

topology.c

include

asm-ia64

numa.h

-2

arch/ia64/kernel/topology.c

··· 36 36 */ 37 37 if (!can_cpei_retarget() && is_cpu_cpei_target(num)) 38 38 sysfs_cpus[num].cpu.no_control = 1; 39 - #ifdef CONFIG_NUMA 40 39 map_cpu_to_node(num, node_cpuid[num].nid); 41 - #endif 42 40 #endif 43 41 44 42 return register_cpu(&sysfs_cpus[num].cpu, num);

include/asm-ia64/numa.h

··· 69 69 70 70 71 71 #else /* !CONFIG_NUMA */ 72 + #define map_cpu_to_node(cpu, nid) do{}while(0) 73 + #define unmap_cpu_from_node(cpu, nid) do{}while(0) 72 74 73 75 #define paddr_to_nid(addr) 0 74 76