diff options
Diffstat (limited to 'arch/x86/include/asm/dma.h')
| -rw-r--r-- | arch/x86/include/asm/dma.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/include/asm/dma.h b/arch/x86/include/asm/dma.h index 057099e5faba..0bdb0c54d9a1 100644 --- a/arch/x86/include/asm/dma.h +++ b/arch/x86/include/asm/dma.h | |||
| @@ -69,22 +69,18 @@ | |||
| 69 | 69 | ||
| 70 | #define MAX_DMA_CHANNELS 8 | 70 | #define MAX_DMA_CHANNELS 8 |
| 71 | 71 | ||
| 72 | #ifdef CONFIG_X86_32 | ||
| 73 | |||
| 74 | /* The maximum address that we can perform a DMA transfer to on this platform */ | ||
| 75 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + 0x1000000) | ||
| 76 | |||
| 77 | #else | ||
| 78 | |||
| 79 | /* 16MB ISA DMA zone */ | 72 | /* 16MB ISA DMA zone */ |
| 80 | #define MAX_DMA_PFN ((16 * 1024 * 1024) >> PAGE_SHIFT) | 73 | #define MAX_DMA_PFN ((16 * 1024 * 1024) >> PAGE_SHIFT) |
| 81 | 74 | ||
| 82 | /* 4GB broken PCI/AGP hardware bus master zone */ | 75 | /* 4GB broken PCI/AGP hardware bus master zone */ |
| 83 | #define MAX_DMA32_PFN ((4UL * 1024 * 1024 * 1024) >> PAGE_SHIFT) | 76 | #define MAX_DMA32_PFN ((4UL * 1024 * 1024 * 1024) >> PAGE_SHIFT) |
| 84 | 77 | ||
| 78 | #ifdef CONFIG_X86_32 | ||
| 79 | /* The maximum address that we can perform a DMA transfer to on this platform */ | ||
| 80 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + 0x1000000) | ||
| 81 | #else | ||
| 85 | /* Compat define for old dma zone */ | 82 | /* Compat define for old dma zone */ |
| 86 | #define MAX_DMA_ADDRESS ((unsigned long)__va(MAX_DMA_PFN << PAGE_SHIFT)) | 83 | #define MAX_DMA_ADDRESS ((unsigned long)__va(MAX_DMA_PFN << PAGE_SHIFT)) |
| 87 | |||
| 88 | #endif | 84 | #endif |
| 89 | 85 | ||
| 90 | /* 8237 DMA controllers */ | 86 | /* 8237 DMA controllers */ |