From df34c2e2f0dae207f45f113bf08f1339401a9164 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Wed, 26 May 2010 14:44:33 -0700
Subject: [PATCH] --- yaml --- r: 198843 b: refs/heads/master c:
 e32205eb5818ab53dbe0ffe6c6fbdaa9af83de72 h: refs/heads/master i:   198841:
 a1d57fa2c451e35bd7e91103c31f8d14aef0aeb1   198839:
 2e210396faf2962519ca5d7775479101be542b0d v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/powerpc/Kconfig                   |  3 ++
 trunk/arch/powerpc/include/asm/scatterlist.h | 29 +-------------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index d1d34ce7a6e6..79a243bd7119 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a14d84ea2adc6c02dde4ae2d4552c15e014a475
+refs/heads/master: e32205eb5818ab53dbe0ffe6c6fbdaa9af83de72
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index c4c4549c22bb..66a315e06dce 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -663,6 +663,9 @@ config ZONE_DMA
 config NEED_DMA_MAP_STATE
 	def_bool (PPC64 || NOT_COHERENT_CACHE)
 
+config NEED_SG_DMA_LENGTH
+	def_bool y
+
 config GENERIC_ISA_DMA
 	bool
 	depends on PPC64 || POWER4 || 6xx && !CPM2
diff --git a/trunk/arch/powerpc/include/asm/scatterlist.h b/trunk/arch/powerpc/include/asm/scatterlist.h
index 912bf597870f..4ae35da4975e 100644
--- a/trunk/arch/powerpc/include/asm/scatterlist.h
+++ b/trunk/arch/powerpc/include/asm/scatterlist.h
@@ -9,38 +9,11 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#ifdef __KERNEL__
-#include <linux/types.h>
 #include <asm/dma.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-	unsigned long sg_magic;
-#endif
-	unsigned long page_link;
-	unsigned int offset;
-	unsigned int length;
-
-	/* For TCE or SWIOTLB support */
-	dma_addr_t dma_address;
-	u32 dma_length;
-};
-
-/*
- * These macros should be used after a dma_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)	((sg)->dma_address)
-#define sg_dma_len(sg)		((sg)->dma_length)
+#include <asm-generic/scatterlist.h>
 
 #ifdef __powerpc64__
 #define ISA_DMA_THRESHOLD	(~0UL)
 #endif
 
-#define ARCH_HAS_SG_CHAIN
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_SCATTERLIST_H */