Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ebc51d7 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

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



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f28b8d60

include/asm-x86/scatterlist.h

+32 −2
Original line number Diff line number Diff line 
#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

# include "scatterlist_32.h"

# define sg_dma_len(sg)		((sg)->length)

#else

# include "scatterlist_64.h"

# define sg_dma_len(sg)		((sg)->dma_length)

#endif



#endif

include/asm-x86/scatterlist_32.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
#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) */

include/asm-x86/scatterlist_64.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#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