diff options
Diffstat (limited to 'arch/m32r/mm/discontig.c')
-rw-r--r-- | arch/m32r/mm/discontig.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c index 2c468e8b5853..27196303ce36 100644 --- a/arch/m32r/mm/discontig.c +++ b/arch/m32r/mm/discontig.c | |||
@@ -129,11 +129,10 @@ unsigned long __init setup_memory(void) | |||
129 | #define START_PFN(nid) (NODE_DATA(nid)->bdata->node_min_pfn) | 129 | #define START_PFN(nid) (NODE_DATA(nid)->bdata->node_min_pfn) |
130 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) | 130 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) |
131 | 131 | ||
132 | unsigned long __init zone_sizes_init(void) | 132 | void __init zone_sizes_init(void) |
133 | { | 133 | { |
134 | unsigned long zones_size[MAX_NR_ZONES], zholes_size[MAX_NR_ZONES]; | 134 | unsigned long zones_size[MAX_NR_ZONES], zholes_size[MAX_NR_ZONES]; |
135 | unsigned long low, start_pfn; | 135 | unsigned long low, start_pfn; |
136 | unsigned long holes = 0; | ||
137 | int nid, i; | 136 | int nid, i; |
138 | mem_prof_t *mp; | 137 | mem_prof_t *mp; |
139 | 138 | ||
@@ -147,7 +146,6 @@ unsigned long __init zone_sizes_init(void) | |||
147 | low = MAX_LOW_PFN(nid); | 146 | low = MAX_LOW_PFN(nid); |
148 | zones_size[ZONE_DMA] = low - start_pfn; | 147 | zones_size[ZONE_DMA] = low - start_pfn; |
149 | zholes_size[ZONE_DMA] = mp->holes; | 148 | zholes_size[ZONE_DMA] = mp->holes; |
150 | holes += zholes_size[ZONE_DMA]; | ||
151 | 149 | ||
152 | node_set_state(nid, N_NORMAL_MEMORY); | 150 | node_set_state(nid, N_NORMAL_MEMORY); |
153 | free_area_init_node(nid, zones_size, start_pfn, zholes_size); | 151 | free_area_init_node(nid, zones_size, start_pfn, zholes_size); |
@@ -161,6 +159,4 @@ unsigned long __init zone_sizes_init(void) | |||
161 | NODE_DATA(1)->node_zones->watermark[WMARK_MIN] = 0; | 159 | NODE_DATA(1)->node_zones->watermark[WMARK_MIN] = 0; |
162 | NODE_DATA(1)->node_zones->watermark[WMARK_LOW] = 0; | 160 | NODE_DATA(1)->node_zones->watermark[WMARK_LOW] = 0; |
163 | NODE_DATA(1)->node_zones->watermark[WMARK_HIGH] = 0; | 161 | NODE_DATA(1)->node_zones->watermark[WMARK_HIGH] = 0; |
164 | |||
165 | return holes; | ||
166 | } | 162 | } |