diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
commit | ad90fb97515b732bc27a0109baa10af636c3c8cd (patch) | |
tree | 9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /include/asm-generic | |
parent | 6a398a3ef404e661999cd4c58974cbceb52762e3 (diff) | |
parent | c546d5db75b452737e554bb9c33dedb46847c4fd (diff) | |
download | op-kernel-dev-ad90fb97515b732bc27a0109baa10af636c3c8cd.zip op-kernel-dev-ad90fb97515b732bc27a0109baa10af636c3c8cd.tar.gz |
Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
Pull asm/scatterlist.h removal from Jens Axboe:
"We don't have any specific arch scatterlist anymore, since parisc
finally switched over. Kill the include"
* 'for-4.2/sg' of git://git.kernel.dk/linux-block:
remove scatterlist.h generation from arch Kbuild files
remove <asm/scatterlist.h>
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/scatterlist.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/include/asm-generic/scatterlist.h b/include/asm-generic/scatterlist.h deleted file mode 100644 index 5de0735..0000000 --- a/include/asm-generic/scatterlist.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef __ASM_GENERIC_SCATTERLIST_H -#define __ASM_GENERIC_SCATTERLIST_H - -#include <linux/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; -#ifdef CONFIG_NEED_SG_DMA_LENGTH - unsigned int dma_length; -#endif -}; - -/* - * 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) - -#ifdef CONFIG_NEED_SG_DMA_LENGTH -#define sg_dma_len(sg) ((sg)->dma_length) -#else -#define sg_dma_len(sg) ((sg)->length) -#endif - -#endif /* __ASM_GENERIC_SCATTERLIST_H */ |