lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: merge include/asm-x86/scatterlist.h

Browse Source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner
2008-01-30 13:30:21 +01:00
committed by Ingo Molnar
parent f28b8d6088
commit 3ebc51d7c9
3 changed files with 34 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/asm-x86/scatterlist.h
View File

@@ -1,5 +1,35 @@
#ifdef CONFIG_X86_32 #ifndef _ASM_X86_SCATTERLIST_H
# include "scatterlist_32.h" #define _ASM_X86_SCATTERLIST_H
#else
# include "scatterlist_64.h" #include <asm/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_X86_64
unsigned int dma_length;
#endif
};
#define ARCH_HAS_SG_CHAIN
#define ISA_DMA_THRESHOLD (0x00ffffff)
/*
* These macros should be used after a pci_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.
*/
#define sg_dma_address(sg) ((sg)->dma_address)
#ifdef CONFIG_X86_32
# define sg_dma_len(sg) ((sg)->length)
#else
# define sg_dma_len(sg) ((sg)->dma_length)
#endif
#endif #endif

28
include/asm-x86/scatterlist_32.h
View File

@@ -1,28 +0,0 @@
#ifndef _I386_SCATTERLIST_H
#define _I386_SCATTERLIST_H
#include <asm/types.h>
struct scatterlist {
#ifdef CONFIG_DEBUG_SG
unsigned long sg_magic;
#endif
unsigned long page_link;
unsigned int offset;
dma_addr_t dma_address;
unsigned int length;
};
#define ARCH_HAS_SG_CHAIN
/* These macros should be used after a pci_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.
*/
#define sg_dma_address(sg) ((sg)->dma_address)
#define sg_dma_len(sg) ((sg)->length)
#define ISA_DMA_THRESHOLD (0x00ffffff)
#endif /* !(_I386_SCATTERLIST_H) */

29
include/asm-x86/scatterlist_64.h
View File

@@ -1,29 +0,0 @@
#ifndef _X8664_SCATTERLIST_H
#define _X8664_SCATTERLIST_H
#include <asm/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;
unsigned int dma_length;
};
#define ARCH_HAS_SG_CHAIN
#define ISA_DMA_THRESHOLD (0x00ffffff)
/* These macros should be used after a pci_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.
*/
#define sg_dma_address(sg) ((sg)->dma_address)
#define sg_dma_len(sg) ((sg)->dma_length)
#endif