|
@@ -126,13 +126,13 @@ static unsigned long __meminitdata dma_reserve;
|
|
|
#endif
|
|
|
#endif
|
|
|
|
|
|
- struct node_active_region __meminitdata early_node_map[MAX_ACTIVE_REGIONS];
|
|
|
- int __meminitdata nr_nodemap_entries;
|
|
|
- unsigned long __meminitdata arch_zone_lowest_possible_pfn[MAX_NR_ZONES];
|
|
|
- unsigned long __meminitdata arch_zone_highest_possible_pfn[MAX_NR_ZONES];
|
|
|
+ static struct node_active_region __meminitdata early_node_map[MAX_ACTIVE_REGIONS];
|
|
|
+ static int __meminitdata nr_nodemap_entries;
|
|
|
+ static unsigned long __meminitdata arch_zone_lowest_possible_pfn[MAX_NR_ZONES];
|
|
|
+ static unsigned long __meminitdata arch_zone_highest_possible_pfn[MAX_NR_ZONES];
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG_RESERVE
|
|
|
- unsigned long __initdata node_boundary_start_pfn[MAX_NUMNODES];
|
|
|
- unsigned long __initdata node_boundary_end_pfn[MAX_NUMNODES];
|
|
|
+ static unsigned long __meminitdata node_boundary_start_pfn[MAX_NUMNODES];
|
|
|
+ static unsigned long __meminitdata node_boundary_end_pfn[MAX_NUMNODES];
|
|
|
#endif /* CONFIG_MEMORY_HOTPLUG_RESERVE */
|
|
|
#endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
|
|
|
|
|
@@ -2599,7 +2599,7 @@ void __init push_node_boundaries(unsigned int nid,
|
|
|
}
|
|
|
|
|
|
/* If necessary, push the node boundary out for reserve hotadd */
|
|
|
-static void __init account_node_boundary(unsigned int nid,
|
|
|
+static void __meminit account_node_boundary(unsigned int nid,
|
|
|
unsigned long *start_pfn, unsigned long *end_pfn)
|
|
|
{
|
|
|
printk(KERN_DEBUG "Entering account_node_boundary(%u, %lu, %lu)\n",
|
|
@@ -2619,7 +2619,7 @@ static void __init account_node_boundary(unsigned int nid,
|
|
|
void __init push_node_boundaries(unsigned int nid,
|
|
|
unsigned long start_pfn, unsigned long end_pfn) {}
|
|
|
|
|
|
-static void __init account_node_boundary(unsigned int nid,
|
|
|
+static void __meminit account_node_boundary(unsigned int nid,
|
|
|
unsigned long *start_pfn, unsigned long *end_pfn) {}
|
|
|
#endif
|
|
|
|