diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2004-06-29 18:17:09 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-06-29 18:17:09 +0100 |
| commit | 550c2ef011e52895b38cc6f4afa195b4827a06ed (patch) | |
| tree | 283fe8e95828b055aa55682d182ee9ac1f8bed91 /include | |
| parent | c9ae8c6cd2c4195856d0e52177f7ea2906f3ea84 (diff) | |
[ARM] Move ISA_DMA_THRESHOLD to asm/memory.h
This allows machine classes to override ISA_DMA_THRESHOLD as
necessary.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/memory.h | 10 | ||||
| -rw-r--r-- | include/asm-arm/processor.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/scatterlist.h | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index 91dee4da45ce..aea8854a79a0 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h @@ -57,6 +57,16 @@ #error Top of user space clashes with start of module space #endif +/* + * The DMA mask corresponding to the maximum bus address allocatable + * using GFP_DMA. The default here places no restriction on DMA + * allocations. This must be the smallest DMA mask in the system, + * so a successful GFP_DMA allocation will always satisfy this. + */ +#ifndef ISA_DMA_THRESHOLD +#define ISA_DMA_THRESHOLD (0xffffffffULL) +#endif + #ifndef __ASSEMBLY__ /* diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h index 3890d6038355..e2de28eec30a 100644 --- a/include/asm-arm/processor.h +++ b/include/asm-arm/processor.h @@ -25,7 +25,6 @@ #include <asm/atomic.h> #include <asm/ptrace.h> #include <asm/procinfo.h> -#include <asm/arch/memory.h> #include <asm/types.h> #define KERNEL_STACK_SIZE PAGE_SIZE diff --git a/include/asm-arm/scatterlist.h b/include/asm-arm/scatterlist.h index d9c056c7784e..83b876fb04cc 100644 --- a/include/asm-arm/scatterlist.h +++ b/include/asm-arm/scatterlist.h @@ -1,6 +1,7 @@ #ifndef _ASMARM_SCATTERLIST_H #define _ASMARM_SCATTERLIST_H +#include <asm/memory.h> #include <asm/types.h> struct scatterlist { @@ -21,6 +22,4 @@ struct scatterlist { #define sg_dma_address(sg) ((sg)->dma_address) #define sg_dma_len(sg) ((sg)->length) -#define ISA_DMA_THRESHOLD (0xffffffff) - #endif /* _ASMARM_SCATTERLIST_H */ |