diff options
Diffstat (limited to 'arch/ia64/mm/init.c')
-rw-r--r-- | arch/ia64/mm/init.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index c0f3bee69042..b115b3bbf04a 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -422,8 +422,7 @@ retry_pte: | |||
422 | return hole_next_pfn - pgdat->node_start_pfn; | 422 | return hole_next_pfn - pgdat->node_start_pfn; |
423 | } | 423 | } |
424 | 424 | ||
425 | int __init | 425 | int __init create_mem_map_page_table(u64 start, u64 end, void *arg) |
426 | create_mem_map_page_table (u64 start, u64 end, void *arg) | ||
427 | { | 426 | { |
428 | unsigned long address, start_page, end_page; | 427 | unsigned long address, start_page, end_page; |
429 | struct page *map_start, *map_end; | 428 | struct page *map_start, *map_end; |
@@ -469,7 +468,7 @@ struct memmap_init_callback_data { | |||
469 | }; | 468 | }; |
470 | 469 | ||
471 | static int __meminit | 470 | static int __meminit |
472 | virtual_memmap_init (u64 start, u64 end, void *arg) | 471 | virtual_memmap_init(u64 start, u64 end, void *arg) |
473 | { | 472 | { |
474 | struct memmap_init_callback_data *args; | 473 | struct memmap_init_callback_data *args; |
475 | struct page *map_start, *map_end; | 474 | struct page *map_start, *map_end; |
@@ -531,8 +530,7 @@ ia64_pfn_valid (unsigned long pfn) | |||
531 | } | 530 | } |
532 | EXPORT_SYMBOL(ia64_pfn_valid); | 531 | EXPORT_SYMBOL(ia64_pfn_valid); |
533 | 532 | ||
534 | int __init | 533 | int __init find_largest_hole(u64 start, u64 end, void *arg) |
535 | find_largest_hole (u64 start, u64 end, void *arg) | ||
536 | { | 534 | { |
537 | u64 *max_gap = arg; | 535 | u64 *max_gap = arg; |
538 | 536 | ||
@@ -548,8 +546,7 @@ find_largest_hole (u64 start, u64 end, void *arg) | |||
548 | 546 | ||
549 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ | 547 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ |
550 | 548 | ||
551 | int __init | 549 | int __init register_active_ranges(u64 start, u64 len, int nid) |
552 | register_active_ranges(u64 start, u64 len, int nid) | ||
553 | { | 550 | { |
554 | u64 end = start + len; | 551 | u64 end = start + len; |
555 | 552 | ||
@@ -567,7 +564,7 @@ register_active_ranges(u64 start, u64 len, int nid) | |||
567 | } | 564 | } |
568 | 565 | ||
569 | static int __init | 566 | static int __init |
570 | count_reserved_pages (u64 start, u64 end, void *arg) | 567 | count_reserved_pages(u64 start, u64 end, void *arg) |
571 | { | 568 | { |
572 | unsigned long num_reserved = 0; | 569 | unsigned long num_reserved = 0; |
573 | unsigned long *count = arg; | 570 | unsigned long *count = arg; |
@@ -580,7 +577,7 @@ count_reserved_pages (u64 start, u64 end, void *arg) | |||
580 | } | 577 | } |
581 | 578 | ||
582 | int | 579 | int |
583 | find_max_min_low_pfn (unsigned long start, unsigned long end, void *arg) | 580 | find_max_min_low_pfn (u64 start, u64 end, void *arg) |
584 | { | 581 | { |
585 | unsigned long pfn_start, pfn_end; | 582 | unsigned long pfn_start, pfn_end; |
586 | #ifdef CONFIG_FLATMEM | 583 | #ifdef CONFIG_FLATMEM |