diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-07-01 16:12:53 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-07-01 16:12:53 -0700 |
| commit | daf4219dbcbb2efcd638fcd3c29a622e1c18cc38 (patch) | |
| tree | 8683d86a8a8de2060c83aed7efe5f66b94027a2b | |
| parent | 43a1a3ed6bf5a1b9ae197b4f5f20033baf19db61 (diff) | |
| download | kernel_samsung_aries-daf4219dbcbb2efcd638fcd3c29a622e1c18cc38.zip kernel_samsung_aries-daf4219dbcbb2efcd638fcd3c29a622e1c18cc38.tar.gz kernel_samsung_aries-daf4219dbcbb2efcd638fcd3c29a622e1c18cc38.tar.bz2 | |
dmaengine: move HIGHMEM64G restriction to ASYNC_TX_DMA
On HIGHMEM64G systems dma_addr_t is known to be larger than (void *)
which precludes async_xor from performing dma address conversions by
reusing the input parameter address list. However, other parts of the
dmaengine infrastructure do not suffer this constraint, so the
HIGHMEM64G restriction can be down-levelled.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
| -rw-r--r-- | crypto/async_tx/async_xor.c | 2 | ||||
| -rw-r--r-- | drivers/dma/Kconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 95fe2c8..90dd3f8 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -300,7 +300,7 @@ EXPORT_SYMBOL_GPL(async_xor_zero_sum); static int __init async_xor_init(void) { - #ifdef CONFIG_DMA_ENGINE + #ifdef CONFIG_ASYNC_TX_DMA /* To conserve stack space the input src_list (array of page pointers) * is reused to hold the array of dma addresses passed to the driver. * This conversion is only possible when dma_addr_t is less than the diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 3b3c01b..babf214 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -4,7 +4,7 @@ menuconfig DMADEVICES bool "DMA Engine support" - depends on !HIGHMEM64G && HAS_DMA + depends on HAS_DMA help DMA engines can do asynchronous data transfers without involving the host CPU. Currently, this framework can be @@ -100,7 +100,7 @@ config NET_DMA config ASYNC_TX_DMA bool "Async_tx: Offload support for the async_tx api" - depends on DMA_ENGINE + depends on DMA_ENGINE && !HIGHMEM64G help This allows the async_tx api to take advantage of offload engines for memcpy, memset, xor, and raid6 p+q operations. If your platform has |