diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-05-26 14:44:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 09:12:54 -0700 |
| commit | 48c7cf4797d04b3ffcb060fa64c3c500b7371e8b (patch) | |
| tree | 1071bc91768ed32ed7019c1264ee4bc3c6fb9cec /arch/alpha | |
| parent | e32205eb5818ab53dbe0ffe6c6fbdaa9af83de72 (diff) | |
| download | linux-3.10-48c7cf4797d04b3ffcb060fa64c3c500b7371e8b.tar.gz linux-3.10-48c7cf4797d04b3ffcb060fa64c3c500b7371e8b.tar.bz2 linux-3.10-48c7cf4797d04b3ffcb060fa64c3c500b7371e8b.zip | |
alpha: use asm-generic/scatterlist.h
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Matt Turner <mattst88@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/Kconfig | 3 | ||||
| -rw-r--r-- | arch/alpha/include/asm/scatterlist.h | 21 |
2 files changed, 6 insertions, 18 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 24efdfe277f..3e2e540a0f2 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -61,6 +61,9 @@ config ZONE_DMA config NEED_DMA_MAP_STATE def_bool y +config NEED_SG_DMA_LENGTH + def_bool y + config GENERIC_ISA_DMA bool default y diff --git a/arch/alpha/include/asm/scatterlist.h b/arch/alpha/include/asm/scatterlist.h index 440747ca634..85a0ef25516 100644 --- a/arch/alpha/include/asm/scatterlist.h +++ b/arch/alpha/include/asm/scatterlist.h @@ -1,25 +1,10 @@ #ifndef _ALPHA_SCATTERLIST_H #define _ALPHA_SCATTERLIST_H -#include <asm/page.h> -#include <asm/types.h> - -struct scatterlist { -#ifdef CONFIG_DEBUG_SG - unsigned long sg_magic; -#endif - unsigned long page_link; - unsigned int offset; - - unsigned int length; - - dma_addr_t dma_address; - __u32 dma_length; -}; +#define ISA_DMA_THRESHOLD (~0UL) -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->dma_length) +#include <asm-generic/scatterlist.h> -#define ISA_DMA_THRESHOLD (~0UL) +#undef ARCH_HAS_SG_CHAIN #endif /* !(_ALPHA_SCATTERLIST_H) */ |