diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-17 22:00:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-17 22:00:43 -0500 |
| commit | 67f4efdce7d85282fbd5832cddc80a07eb89b6d6 (patch) | |
| tree | 9a1771ef13b27abdf8cf172e5b7556ab93e5c48c /arch/ia64 | |
| parent | c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 acd5b68e887..082e383c1b6 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); |