diff options
| author | Greg Kroah-Hartman | 2012-11-17 03:26:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-17 03:26:00 +0100 |
| commit | 1e619a1bf9ac878e6a984e4e279ccf712a65bc23 (patch) | |
| tree | 1d5cfb16f88e36dca2f57386dd4a585a63f15287 /arch/ia64 | |
| parent | staging: Add SystemBase Multi-2/PCI driver (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | kernel-qcow2-linux-1e619a1bf9ac878e6a984e4e279ccf712a65bc23.tar.gz kernel-qcow2-linux-1e619a1bf9ac878e6a984e4e279ccf712a65bc23.tar.xz kernel-qcow2-linux-1e619a1bf9ac878e6a984e4e279ccf712a65bc23.zip | |
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) high_memory = __va(max_low_pfn * PAGE_SIZE); - reset_zone_present_pages(); for_each_online_pgdat(pgdat) if (pgdat->bdata->node_bootmem_map) totalram_pages += free_all_bootmem_node(pgdat); |