x86: merge include/asm-x86/scatterlist.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
f28b8d6088
commit
3ebc51d7c9
|
@ -1,5 +1,35 @@
|
|||
#ifdef CONFIG_X86_32
|
||||
# include "scatterlist_32.h"
|
||||
#else
|
||||
# include "scatterlist_64.h"
|
||||
#ifndef _ASM_X86_SCATTERLIST_H
|
||||
#define _ASM_X86_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;
|
||||
#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
|
||||
|
|
|
@ -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) */
|
|
@ -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
|
Loading…
Reference in New Issue