(memory hotplug) fix compile error for i386 with NUMA config (take 3).
PATCH 1/1 (memory hotplug) fix compile error for i386 with NUMA config (take 3).
Hello.
This is take 3 patch to fix compile error when config memory hotplug with numa on i386.
The cause of compile error was missing of arch_add_memory(), remove_memory(), and memory_add_physaddr_to_nid().
I fixed some bad points, and tested no compile error of it.
This is for 2.6.20-rc1.
Please apply.
--- arch/i386/mm/discontig.c | 28 ++++++++++++++++++++++++++++ arch/i386/mm/init.c | 10 ++-------- 2 files changed, 30 insertions(+), 8 deletions(-)
arch/i386/mm/init.c +2 -8
@@ -673,16 +673,10 @@#endif } -/* -* this is for the non-NUMA, single node SMP system case. -* Specifically, in the case of x86, we will always add -* memory to the highmem for now. -*/ #ifdef CONFIG_MEMORY_HOTPLUG -#ifndef CONFIG_NEED_MULTIPLE_NODESint arch_add_memory (int nid,u64 start,u64 size) { - struct pglist_data *pgdata = &contig_page_data; +struct pglist_data *pgdata =NODE_DATA (nid);struct zone *zone = pgdata->node_zones +ZONE_HIGHMEM ;unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;
@@ -694,7 +688,7 @@ {return -EINVAL ; } -#endif +EXPORT_SYMBOL_GPL (remove_memory);#endif struct kmem_cache *pgd_cache;
arch/i386/mm/discontig.c +28 -0
@@ -405,3 +405,31 @@ totalram_pages += totalhigh_pages;#endif } + +#ifdef CONFIG_MEMORY_HOTPLUG +int paddr_to_nid (u64 addr) +{ +int nid; +unsigned long pfn =PFN_DOWN (addr); + +for_each_node (nid) +if (node_start_pfn[nid] <= pfn && + pfn < node_end_pfn[nid]) +return nid; + +return -1 ; +} + +/* +* This function is used to ask node id BEFORE memmap and mem_section's +* initialization (pfn_to_nid() can't be used yet). +* If _PXM is not defined on ACPI's DSDT, node id must be found by this. +*/ +int memory_add_physaddr_to_nid (u64 addr) +{ +int nid =paddr_to_nid (addr); +return (nid >=0 ) ? nid :0 ; +} + +EXPORT_SYMBOL_GPL (memory_add_physaddr_to_nid); +#endif
Signature · 1 line
Yasunori Goto
Quoted 8 lines · Yasunori Goto
Hello.
This is take 3 patch to fix compile error when config memory hotplug with numa on i386.
The cause of compile error was missing of
arch_add_memory(),remove_memory(), andmemory_add_physaddr_to_nid().
Quoted 7 lines
I fixed some bad points, and tested no compile error of it.
This is for 2.6.20-rc1.
Please apply.
Signed-off-by Yasunori Goto <[email protected]>
Quoted 8 lines · On Wed, 20 Dec 2006 23:09:58 +0900 Yasunori Goto wrote:
Hello.
This is take 3 patch to fix compile error when config memory hotplug with numa on i386.
The cause of compile error was missing of
arch_add_memory(),remove_memory(), andmemory_add_physaddr_to_nid().
Quoted 7 lines
I fixed some bad points, and tested no compile error of it.
This is for 2.6.20-rc1.
Please apply.
Signed-off-by Yasunori Goto <[email protected]>
after also using the register_memory() patch.
Quoted 74 lines
--- arch/i386/mm/discontig.c | 28 ++++++++++++++++++++++++++++ arch/i386/mm/init.c | 10 ++-------- 2 files changed, 30 insertions(+), 8 deletions(-)Index:
linux-2.6.20-rc1/arch/i386/mm/init.c
===================================================================arch/i386/mm/init.c +2
-8@@ -673,16 +673,10 @@#endif } -/* -* this is for the non-NUMA, single node SMP system case. -* Specifically, in the case of x86, we will always add -* memory to the highmem for now. -*/ #ifdef CONFIG_MEMORY_HOTPLUG -#ifndef CONFIG_NEED_MULTIPLE_NODESint arch_add_memory (int nid,u64 start,u64 size) { - struct pglist_data *pgdata = &contig_page_data; +struct pglist_data *pgdata =NODE_DATA (nid);struct zone *zone = pgdata->node_zones +ZONE_HIGHMEM ;unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;@@ -694,7 +688,7 @@ {return -EINVAL ; } -#endif +EXPORT_SYMBOL_GPL (remove_memory);#endif struct kmem_cache *pgd_cache;Index:
linux-2.6.20-rc1/arch/i386/mm/discontig.c
===================================================================arch/i386/mm/discontig.c +28
-0@@ -405,3 +405,31 @@ totalram_pages += totalhigh_pages;#endif } + +#ifdef CONFIG_MEMORY_HOTPLUG +int paddr_to_nid (u64 addr) +{ +int nid; +unsigned long pfn =PFN_DOWN (addr); + +for_each_node (nid) +if (node_start_pfn[nid] <= pfn && + pfn < node_end_pfn[nid]) +return nid; + +return -1 ; +} + +/* +* This function is used to ask node id BEFORE memmap and mem_section's +* initialization (pfn_to_nid() can't be used yet). +* If _PXM is not defined on ACPI's DSDT, node id must be found by this. +*/ +int memory_add_physaddr_to_nid (u64 addr) +{ +int nid =paddr_to_nid (addr); +return (nid >=0 ) ? nid :0 ; +} + +EXPORT_SYMBOL_GPL (memory_add_physaddr_to_nid); +#endif Signature · 1 line
--
---
~Randy
Quoted 1 line · On Wed, 20 Dec 2006 23:09:58 +0900 Yasunori Goto <[email protected]> wrote:
+EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
Exported to acpi_memhotplug, I guess.
Is not actually needed on NUMAQ. I don't think anyone will
complain much ;)