From 9ce34c8f4466608bc67630a42d04f4aaf0443d9b Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 19 Mar 2010 12:23:57 -0400 Subject: Convert alpha to use clocksources instead of arch_gettimeoffset Alpha has a tsc like rpcc counter that it uses to manage time. This can be converted to an actual clocksource instead of utilizing the arch_gettimeoffset method that is really only there for legacy systems with no continuous counter. Further cleanups could be made if alpha converted to the clockevent model. CC: Thomas Gleixner CC: Richard Henderson Acked-by: Ivan Kokshaysky Tested-by: Ivan Kokshaysky Signed-off-by: Matt Turner Signed-off-by: John Stultz --- arch/alpha/Kconfig | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/alpha/Kconfig') diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index b7193986cbf9..24efdfe277fc 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -51,10 +51,6 @@ config GENERIC_TIME bool default y -config ARCH_USES_GETTIMEOFFSET - bool - default y - config GENERIC_CMOS_UPDATE def_bool y -- cgit v1.2.3 From 48c7cf4797d04b3ffcb060fa64c3c500b7371e8b Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 26 May 2010 14:44:34 -0700 Subject: alpha: use asm-generic/scatterlist.h Signed-off-by: FUJITA Tomonori Acked-by: Matt Turner Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/alpha/Kconfig | 3 +++ arch/alpha/include/asm/scatterlist.h | 21 +++------------------ 2 files changed, 6 insertions(+), 18 deletions(-) (limited to 'arch/alpha/Kconfig') diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 24efdfe277fc..3e2e540a0f2a 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 440747ca6349..85a0ef25516b 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 -#include - -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 -#define ISA_DMA_THRESHOLD (~0UL) +#undef ARCH_HAS_SG_CHAIN #endif /* !(_ALPHA_SCATTERLIST_H) */ -- cgit v1.2.3