diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:26:00 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:26:00 -0500 |
| commit | 1e619a1bf9ac878e6a984e4e279ccf712a65bc23 (patch) | |
| tree | 1d5cfb16f88e36dca2f57386dd4a585a63f15287 /arch/ia64 | |
| parent | 68a81291ff6650f3ff409ebfc58ef97dfe85a2e4 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge 3.7-rc6 into tty-next
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index acd5b68e8871..082e383c1b6f 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
| @@ -637,7 +637,6 @@ mem_init (void) | |||
| 637 | 637 | ||
| 638 | high_memory = __va(max_low_pfn * PAGE_SIZE); | 638 | high_memory = __va(max_low_pfn * PAGE_SIZE); |
| 639 | 639 | ||
| 640 | reset_zone_present_pages(); | ||
| 641 | for_each_online_pgdat(pgdat) | 640 | for_each_online_pgdat(pgdat) |
| 642 | if (pgdat->bdata->node_bootmem_map) | 641 | if (pgdat->bdata->node_bootmem_map) |
| 643 | totalram_pages += free_all_bootmem_node(pgdat); | 642 | totalram_pages += free_all_bootmem_node(pgdat); |