diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-13 06:48:07 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-13 06:48:07 (GMT) |
commit | 6214b54cbf0778804de1297444c7661e70bc4d74 (patch) | |
tree | 262a96d1be839a30e6e8d3f3452806b7f337148c /arch/arm64/mm/init.c | |
parent | 05193639ca977cc889668718adb38db6d585045b (diff) | |
parent | ba027da8eb309252cb611f23808da51487f68e12 (diff) | |
download | linux-fsl-qoriq-6214b54cbf0778804de1297444c7661e70bc4d74.tar.xz |
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
A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
Diffstat (limited to 'arch/arm64/mm/init.c')
-rw-r--r-- | arch/arm64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index efbf7df..4cd2893 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -80,7 +80,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) #ifdef CONFIG_ZONE_DMA32 /* 4GB maximum for 32-bit only capable devices */ max_dma32 = min(max, MAX_DMA32_PFN); - zone_size[ZONE_DMA32] = max_dma32 - min; + zone_size[ZONE_DMA32] = max(min, max_dma32) - min; #endif zone_size[ZONE_NORMAL] = max - max_dma32; |