diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 18:04:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:39 -0400 |
commit | d5c017dde4ea0932f861d3ddf2b2ade92ee3d033 (patch) | |
tree | 4759d4e989c0dd291dbcd6e13de3a6fd0703da3e /arch/parisc | |
parent | 629e7b4c8051f88daa7d2d53283128a4b2a6fa72 (diff) |
mm/PARISC: prepare for killing free_all_bootmem_node()
Prepare for killing free_all_bootmem_node() by using free_all_bootmem().
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/mm/init.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index b4edc76c6f22..b0f96c0e6316 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -585,18 +585,8 @@ void __init mem_init(void) | |||
585 | > BITS_PER_LONG); | 585 | > BITS_PER_LONG); |
586 | 586 | ||
587 | high_memory = __va((max_pfn << PAGE_SHIFT)); | 587 | high_memory = __va((max_pfn << PAGE_SHIFT)); |
588 | 588 | set_max_mapnr(page_to_pfn(virt_to_page(high_memory - 1)) + 1); | |
589 | #ifndef CONFIG_DISCONTIGMEM | ||
590 | max_mapnr = page_to_pfn(virt_to_page(high_memory - 1)) + 1; | ||
591 | free_all_bootmem(); | 589 | free_all_bootmem(); |
592 | #else | ||
593 | { | ||
594 | int i; | ||
595 | |||
596 | for (i = 0; i < npmem_ranges; i++) | ||
597 | free_all_bootmem_node(NODE_DATA(i)); | ||
598 | } | ||
599 | #endif | ||
600 | 590 | ||
601 | #ifdef CONFIG_PA11 | 591 | #ifdef CONFIG_PA11 |
602 | if (hppa_dma_ops == &pcxl_dma_ops) { | 592 | if (hppa_dma_ops == &pcxl_dma_ops) { |