From: Yasunori Goto This is a patch to allocate pgdat and per node data area for ia64. The size for them can be calculated by compute_pernodesize(). Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton --- arch/ia64/mm/discontig.c | 16 ++++++++++++++-- include/linux/memory_hotplug.h | 9 ++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff -puN arch/ia64/mm/discontig.c~pgdat-allocation-and-update-for-ia64-of-memory-hotplugallocate-pgdat-and-per-node-data arch/ia64/mm/discontig.c --- devel/arch/ia64/mm/discontig.c~pgdat-allocation-and-update-for-ia64-of-memory-hotplugallocate-pgdat-and-per-node-data 2006-05-09 01:17:36.000000000 -0700 +++ devel-akpm/arch/ia64/mm/discontig.c 2006-05-09 01:17:36.000000000 -0700 @@ -100,7 +100,7 @@ static int __init build_node_maps(unsign * acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been * called yet. Note that node 0 will also count all non-existent cpus. */ -static int __init early_nr_cpus_node(int node) +static int __meminit early_nr_cpus_node(int node) { int cpu, n = 0; @@ -115,7 +115,7 @@ static int __init early_nr_cpus_node(int * compute_pernodesize - compute size of pernode data * @node: the node id. */ -static unsigned long __init compute_pernodesize(int node) +static unsigned long __meminit compute_pernodesize(int node) { unsigned long pernodesize = 0, cpus; @@ -792,6 +792,18 @@ void __init paging_init(void) zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page)); } +pg_data_t *arch_alloc_nodedata(int nid) +{ + unsigned long size = compute_pernodesize(nid); + + return kzalloc(size, GFP_KERNEL); +} + +void arch_free_nodedata(pg_data_t *pgdat) +{ + kfree(pgdat); +} + void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat) { pgdat_list[update_node] = update_pgdat; diff -puN include/linux/memory_hotplug.h~pgdat-allocation-and-update-for-ia64-of-memory-hotplugallocate-pgdat-and-per-node-data include/linux/memory_hotplug.h --- devel/include/linux/memory_hotplug.h~pgdat-allocation-and-update-for-ia64-of-memory-hotplugallocate-pgdat-and-per-node-data 2006-05-09 01:17:36.000000000 -0700 +++ devel-akpm/include/linux/memory_hotplug.h 2006-05-09 01:17:36.000000000 -0700 @@ -84,13 +84,8 @@ static inline int memory_add_physaddr_to * Now, arch_free_nodedata() is just defined for error path of node_hot_add. * */ -static inline pg_data_t *arch_alloc_nodedata(int nid) -{ - return NULL; -} -static inline void arch_free_nodedata(pg_data_t *pgdat) -{ -} +extern pg_data_t *arch_alloc_nodedata(int nid); +extern void arch_free_nodedata(pg_data_t *pgdat); extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat); #else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ _