diff options
| author | Jiang Liu <liuj97@gmail.com> | 2013-07-04 00:04:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 01:07:39 +0200 |
| commit | d5c017dde4ea0932f861d3ddf2b2ade92ee3d033 (patch) | |
| tree | 4759d4e989c0dd291dbcd6e13de3a6fd0703da3e /arch | |
| parent | mm/MIPS: prepare for killing free_all_bootmem_node() (diff) | |
| download | linux-d5c017dde4ea0932f861d3ddf2b2ade92ee3d033.tar.xz linux-d5c017dde4ea0932f861d3ddf2b2ade92ee3d033.zip | |
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')
| -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) > BITS_PER_LONG); high_memory = __va((max_pfn << PAGE_SHIFT)); - -#ifndef CONFIG_DISCONTIGMEM - max_mapnr = page_to_pfn(virt_to_page(high_memory - 1)) + 1; + set_max_mapnr(page_to_pfn(virt_to_page(high_memory - 1)) + 1); free_all_bootmem(); -#else - { - int i; - - for (i = 0; i < npmem_ranges; i++) - free_all_bootmem_node(NODE_DATA(i)); - } -#endif #ifdef CONFIG_PA11 if (hppa_dma_ops == &pcxl_dma_ops) { |