diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-24 13:20:52 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-01-15 09:35:51 +0100 |
| commit | d5c23ebf1b52526e8e76b18de6a623984585a76a (patch) | |
| tree | 2adf5c95a4101e4e2e1237cd947100d33cb70eae /arch/ia64/mm/contig.c | |
| parent | 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec (diff) | |
| download | linux-0-day-d5c23ebf1b52526e8e76b18de6a623984585a76a.tar.gz linux-0-day-d5c23ebf1b52526e8e76b18de6a623984585a76a.tar.xz | |
ia64: replace ZONE_DMA with ZONE_DMA32
ia64 uses ZONE_DMA for allocations below 32-bits. These days we
name the zone for that ZONE_DMA32, which will allow to use the
dma-direct and generic swiotlb code as-is, so rename it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'arch/ia64/mm/contig.c')
| -rw-r--r-- | arch/ia64/mm/contig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 52715a71aede0..7d64b30913d1f 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c @@ -237,9 +237,9 @@ paging_init (void) unsigned long max_zone_pfns[MAX_NR_ZONES]; memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); -#ifdef CONFIG_ZONE_DMA +#ifdef CONFIG_ZONE_DMA32 max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT; - max_zone_pfns[ZONE_DMA] = max_dma; + max_zone_pfns[ZONE_DMA32] = max_dma; #endif max_zone_pfns[ZONE_NORMAL] = max_low_pfn; |