[PATCH] ppc64: move sg_dma_{len,address} macros

From: Anton Blanchard <anton@samba.org>

From: Stephen Rothwell <sfr@canb.auug.org.au>

This moves the sg_dma_* macros to asm/scatterlist.h where they belong (and
where almost every other architecture has them).

diff --git a/include/asm-ppc64/pci.h b/include/asm-ppc64/pci.h
index 302186b5920745c9a5c0188acabbefc793fc70ba..68436de7ad3131c7126e3a15a7a236203adb04ff 100644 (file)
--- a/include/asm-ppc64/pci.h
+++ b/include/asm-ppc64/pci.h
@@ -149,9 +149,6 @@ int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,
 /* Tell drivers/pci/proc.c that we have pci_mmap_page_range() */
 #define HAVE_PCI_MMAP  1
 
-#define sg_dma_address(sg)     ((sg)->dma_address)
-#define sg_dma_len(sg)         ((sg)->dma_length)
-
 #define pci_map_page(dev, page, off, size, dir) \
                pci_map_single(dev, (page_address(page) + (off)), size, dir)
 #define pci_unmap_page(dev,addr,sz,dir) pci_unmap_single(dev,addr,sz,dir)

diff --git a/include/asm-ppc64/scatterlist.h b/include/asm-ppc64/scatterlist.h
index e81921d148dc9ed93e45bc12e0186b8c600d8c52..cecce6c6dfbb5975c3cd0a4f8bf4da20526880ee 100644 (file)
--- a/include/asm-ppc64/scatterlist.h
+++ b/include/asm-ppc64/scatterlist.h
@@ -23,6 +23,9 @@ struct scatterlist {
        u32 dma_length;
 };
 
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+
 #define ISA_DMA_THRESHOLD      (~0UL)
 
 #endif /* !(_PPC64_SCATTERLIST_H) */