From b9f4773146bb6abd2e4ec1872548faa4209d8b29 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 26 Feb 2004 06:44:43 -0800 Subject: [PATCH] [PATCH] ppc64: move sg_dma_{len,address} macros From: Anton Blanchard From: Stephen Rothwell This moves the sg_dma_* macros to asm/scatterlist.h where they belong (and where almost every other architecture has them). --- include/asm-ppc64/pci.h | 3 --- include/asm-ppc64/scatterlist.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-ppc64/pci.h b/include/asm-ppc64/pci.h index 302186b592074..68436de7ad313 100644 --- 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 e81921d148dc9..cecce6c6dfbb5 100644 --- 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) */ -- 2.53.0