diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-21 07:18:11 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-21 07:18:11 +0100 |
commit | 789e05275e90b637f2029375715e187fd8cabbf4 (patch) | |
tree | ac6f9626a60e81c8af28b11f67e09bde9e145f24 /arch/ia64/mm/init.c | |
parent | 2ea3c6a2c779e5a6487d2b436770232162dfbbe3 (diff) | |
parent | a6366c519cead55ce537babce2271e3b2a1ccec9 (diff) |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
The biggest batch of fixes here is the Kirkwood DMA fixes, plus a couple
of other small fixes.
Diffstat (limited to 'arch/ia64/mm/init.c')
-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) 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); |