diff options
| -rw-r--r-- | arch/x86/mm/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index eaac1743def7..1f34e9219775 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c | |||
| @@ -277,6 +277,9 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range, | |||
| 277 | end_pfn = limit_pfn; | 277 | end_pfn = limit_pfn; |
| 278 | nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0); | 278 | nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0); |
| 279 | 279 | ||
| 280 | if (!after_bootmem) | ||
| 281 | adjust_range_page_size_mask(mr, nr_range); | ||
| 282 | |||
| 280 | /* try to merge same page size and continuous */ | 283 | /* try to merge same page size and continuous */ |
| 281 | for (i = 0; nr_range > 1 && i < nr_range - 1; i++) { | 284 | for (i = 0; nr_range > 1 && i < nr_range - 1; i++) { |
| 282 | unsigned long old_start; | 285 | unsigned long old_start; |
| @@ -291,9 +294,6 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range, | |||
| 291 | nr_range--; | 294 | nr_range--; |
| 292 | } | 295 | } |
| 293 | 296 | ||
| 294 | if (!after_bootmem) | ||
| 295 | adjust_range_page_size_mask(mr, nr_range); | ||
| 296 | |||
| 297 | for (i = 0; i < nr_range; i++) | 297 | for (i = 0; i < nr_range; i++) |
| 298 | printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n", | 298 | printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n", |
| 299 | mr[i].start, mr[i].end - 1, | 299 | mr[i].start, mr[i].end - 1, |
