aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/mm/discontig.c16
-rw-r--r--include/linux/memory_hotplug.h9
2 files changed, 16 insertions, 9 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 9153465d7fcc..525b082eb661 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -100,7 +100,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len,
100 * acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been 100 * acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been
101 * called yet. Note that node 0 will also count all non-existent cpus. 101 * called yet. Note that node 0 will also count all non-existent cpus.
102 */ 102 */
103static int __init early_nr_cpus_node(int node) 103static int __meminit early_nr_cpus_node(int node)
104{ 104{
105 int cpu, n = 0; 105 int cpu, n = 0;
106 106
@@ -115,7 +115,7 @@ static int __init early_nr_cpus_node(int node)
115 * compute_pernodesize - compute size of pernode data 115 * compute_pernodesize - compute size of pernode data
116 * @node: the node id. 116 * @node: the node id.
117 */ 117 */
118static unsigned long __init compute_pernodesize(int node) 118static unsigned long __meminit compute_pernodesize(int node)
119{ 119{
120 unsigned long pernodesize = 0, cpus; 120 unsigned long pernodesize = 0, cpus;
121 121
@@ -792,6 +792,18 @@ void __init paging_init(void)
792 zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page)); 792 zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
793} 793}
794 794
795pg_data_t *arch_alloc_nodedata(int nid)
796{
797 unsigned long size = compute_pernodesize(nid);
798
799 return kzalloc(size, GFP_KERNEL);
800}
801
802void arch_free_nodedata(pg_data_t *pgdat)
803{
804 kfree(pgdat);
805}
806
795void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat) 807void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)
796{ 808{
797 pgdat_list[update_node] = update_pgdat; 809 pgdat_list[update_node] = update_pgdat;
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 9b6260007e5e..218501cfaeb9 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -84,13 +84,8 @@ static inline int memory_add_physaddr_to_nid(u64 start)
84 * Now, arch_free_nodedata() is just defined for error path of node_hot_add. 84 * Now, arch_free_nodedata() is just defined for error path of node_hot_add.
85 * 85 *
86 */ 86 */
87static inline pg_data_t *arch_alloc_nodedata(int nid) 87extern pg_data_t *arch_alloc_nodedata(int nid);
88{ 88extern void arch_free_nodedata(pg_data_t *pgdat);
89 return NULL;
90}
91static inline void arch_free_nodedata(pg_data_t *pgdat)
92{
93}
94extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat); 89extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat);
95 90
96#else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ 91#else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */