diff options
| author | Greg Kroah-Hartman | 2012-11-17 03:21:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-17 03:21:36 +0100 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /arch/ia64 | |
| parent | misc: apds9802als: Fix the logic checking timeout in als_wait_for_data_ready() (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | kernel-qcow2-linux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.gz kernel-qcow2-linux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.xz kernel-qcow2-linux-98c4514ff6e3072288770db66f91bdb15af8b433.zip | |
Merge 3.7-rc6 into char-misc-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); |