From 864dbf99532606c6d8faa5f8b24962bf1aa161f1 Mon Sep 17 00:00:00 2001 From: Yijing Wang Date: Thu, 21 Mar 2013 11:50:30 +0800 Subject: [PATCH] --- yaml --- r: 362843 b: refs/heads/master c: eee46b3de715c9a2a25ebf3c135b88a1d73d92c2 h: refs/heads/master i: 362841: d053886de5f40120f696f704492f11c91b3558fb 362839: a172c88fdd955e6999e69695389741d3c19bb78d v: v3 --- [refs] | 2 +- trunk/arch/ia64/include/asm/numa.h | 5 ++--- trunk/arch/ia64/mm/numa.c | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 69ec0152f696..e665e4c23395 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d303e9e98fce56cdb3c6f2ac92f626fc2bd51c77 +refs/heads/master: eee46b3de715c9a2a25ebf3c135b88a1d73d92c2 diff --git a/trunk/arch/ia64/include/asm/numa.h b/trunk/arch/ia64/include/asm/numa.h index 2e27ef175652..2db0a6c6daa5 100644 --- a/trunk/arch/ia64/include/asm/numa.h +++ b/trunk/arch/ia64/include/asm/numa.h @@ -67,14 +67,13 @@ extern int paddr_to_nid(unsigned long paddr); extern void map_cpu_to_node(int cpu, int nid); extern void unmap_cpu_from_node(int cpu, int nid); - +extern void numa_clear_node(int cpu); #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 numa_clear_node(cpu) do { } while (0) #endif /* CONFIG_NUMA */ #endif /* _ASM_IA64_NUMA_H */ diff --git a/trunk/arch/ia64/mm/numa.c b/trunk/arch/ia64/mm/numa.c index 3efea7d0a351..def782e31aac 100644 --- a/trunk/arch/ia64/mm/numa.c +++ b/trunk/arch/ia64/mm/numa.c @@ -73,6 +73,11 @@ int __meminit __early_pfn_to_nid(unsigned long pfn) return -1; } +void __cpuinit numa_clear_node(int cpu) +{ + unmap_cpu_from_node(cpu, NUMA_NO_NODE); +} + #ifdef CONFIG_MEMORY_HOTPLUG /* * SRAT information is stored in node_memblk[], then we can use SRAT