Commit 550c2ef0 authored by Russell King's avatar Russell King

[ARM] Move ISA_DMA_THRESHOLD to asm/memory.h

This allows machine classes to override ISA_DMA_THRESHOLD as
necessary.
parent c9ae8c6c
...@@ -57,6 +57,16 @@ ...@@ -57,6 +57,16 @@
#error Top of user space clashes with start of module space #error Top of user space clashes with start of module space
#endif #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__ #ifndef __ASSEMBLY__
/* /*
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
#include <asm/arch/memory.h>
#include <asm/types.h> #include <asm/types.h>
#define KERNEL_STACK_SIZE PAGE_SIZE #define KERNEL_STACK_SIZE PAGE_SIZE
......
#ifndef _ASMARM_SCATTERLIST_H #ifndef _ASMARM_SCATTERLIST_H
#define _ASMARM_SCATTERLIST_H #define _ASMARM_SCATTERLIST_H
#include <asm/memory.h>
#include <asm/types.h> #include <asm/types.h>
struct scatterlist { struct scatterlist {
...@@ -21,6 +22,4 @@ struct scatterlist { ...@@ -21,6 +22,4 @@ struct scatterlist {
#define sg_dma_address(sg) ((sg)->dma_address) #define sg_dma_address(sg) ((sg)->dma_address)
#define sg_dma_len(sg) ((sg)->length) #define sg_dma_len(sg) ((sg)->length)
#define ISA_DMA_THRESHOLD (0xffffffff)
#endif /* _ASMARM_SCATTERLIST_H */ #endif /* _ASMARM_SCATTERLIST_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment