From f66525a40e5bd3e4931f0c2f30be0024a9f9c3eb Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 8 Oct 2003 20:39:34 -0700 Subject: [PATCH] [PATCH] ia64: fix NUMA page table allocation to get memory from the right node --- arch/ia64/mm/init.c | 9 ++++++--- include/asm-ia64/numa.h | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 05dc179d45d67..9f0b302d4abcb 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -342,6 +343,7 @@ create_mem_map_page_table (u64 start, u64 end, void *arg) { unsigned long address, start_page, end_page; struct page *map_start, *map_end; + int node; pgd_t *pgd; pmd_t *pmd; pte_t *pte; @@ -351,19 +353,20 @@ create_mem_map_page_table (u64 start, u64 end, void *arg) start_page = (unsigned long) map_start & PAGE_MASK; end_page = PAGE_ALIGN((unsigned long) map_end); + node = paddr_to_nid(__pa(start)); for (address = start_page; address < end_page; address += PAGE_SIZE) { pgd = pgd_offset_k(address); if (pgd_none(*pgd)) - pgd_populate(&init_mm, pgd, alloc_bootmem_pages(PAGE_SIZE)); + pgd_populate(&init_mm, pgd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)); pmd = pmd_offset(pgd, address); if (pmd_none(*pmd)) - pmd_populate_kernel(&init_mm, pmd, alloc_bootmem_pages(PAGE_SIZE)); + pmd_populate_kernel(&init_mm, pmd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)); pte = pte_offset_kernel(pmd, address); if (pte_none(*pte)) - set_pte(pte, pfn_pte(__pa(alloc_bootmem_pages(PAGE_SIZE)) >> PAGE_SHIFT, + set_pte(pte, pfn_pte(__pa(alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)) >> PAGE_SHIFT, PAGE_KERNEL)); } return 0; diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h index 8b0d5edad7bac..1a85dc50e8e10 100644 --- a/include/asm-ia64/numa.h +++ b/include/asm-ia64/numa.h @@ -61,6 +61,10 @@ extern int paddr_to_nid(unsigned long paddr); #define local_nodeid (cpu_to_node_map[smp_processor_id()]) +#else /* !CONFIG_NUMA */ + +#define paddr_to_nid(addr) 0 + #endif /* CONFIG_NUMA */ #endif /* _ASM_IA64_NUMA_H */ -- 2.53.0