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

Commit 66ed5ef8 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

pci-dma: ia64: use include/linux/pci-dma.h 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 272ecbe5

arch/ia64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ config MMU 
	bool

	default y



config NEED_DMA_MAP_STATE

	def_bool y



config SWIOTLB

       bool

arch/ia64/include/asm/pci.h

+1 −13
Original line number Diff line number Diff line
@@ -56,19 +56,7 @@ pcibios_penalize_isa_irq (int irq, int active) 


#include <asm-generic/pci-dma-compat.h>



/* pci_unmap_{single,page} is not a nop, thus... */

#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\

	dma_addr_t ADDR_NAME;

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\

	__u32 LEN_NAME;

#define pci_unmap_addr(PTR, ADDR_NAME)			\

	((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\

	(((PTR)->ADDR_NAME) = (VAL))

#define pci_unmap_len(PTR, LEN_NAME)			\

	((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\

	(((PTR)->LEN_NAME) = (VAL))

#include <linux/pci-dma.h>



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,