Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff14c1d0 authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit 



Use MAX_DMA_PFN which represents the 16 MB ISA DMA limit on
32-bit x86 just like we do on 64-bit.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1320155902-10424-1-git-send-email-penberg@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5e442a49

arch/x86/mm/init_32.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -679,8 +679,7 @@ static void __init zone_sizes_init(void) 
	unsigned long max_zone_pfns[MAX_NR_ZONES];

	unsigned long max_zone_pfns[MAX_NR_ZONES];

	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

#ifdef CONFIG_ZONE_DMA

#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA] =

	max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;

		virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;

#endif

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

#ifdef CONFIG_HIGHMEM