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

Commit bb4a61b6 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n 



With CONFIG_PCI=n:

In file included from include/linux/pci.h:917,
                 from lib/iomap.c:6:
include/asm/pci.h:104: warning: `enum pci_dma_burst_strategy' declared inside parameter list
include/asm/pci.h:104: warning: its scope is only this definition or declaration, which is probably not what you want.
include/asm/pci.h: In function `pci_dma_burst_advice':
include/asm/pci.h:106: dereferencing pointer to incomplete type
include/asm/pci.h:106: `PCI_DMA_BURST_INFINITY' undeclared (first use in this function)
include/asm/pci.h:106: (Each undeclared identifier is reported only once
include/asm/pci.h:106: for each function it appears in.)
make[1]: *** [lib/iomap.o] Error 1

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e24c2d96

include/asm-alpha/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ pci_dac_dma_sync_single_for_device(struct pci_dev *pdev, dma64_addr_t dma_addr, 
	/* Nothing to do. */

}



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,

					enum pci_dma_burst_strategy *strat,

					unsigned long *strategy_parameter)
@@ -239,6 +240,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, 
	*strat = PCI_DMA_BURST_BOUNDARY;

	*strategy_parameter = cacheline_size;

}

#endif



/* TODO: integrate with include/asm-generic/pci.h ? */

static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

include/asm-arm/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static inline void pcibios_penalize_isa_irq(int irq) 
#define pci_unmap_len(PTR, LEN_NAME)		((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	(((PTR)->LEN_NAME) = (VAL))



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,

					enum pci_dma_burst_strategy *strat,

					unsigned long *strategy_parameter)
@@ -49,6 +50,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, 
	*strat = PCI_DMA_BURST_INFINITY;

	*strategy_parameter = ~0UL;

}

#endif



#define HAVE_PCI_MMAP

extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,

include/asm-frv/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, 
 */

#define PCI_DMA_BUS_IS_PHYS	(1)



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,

					enum pci_dma_burst_strategy *strat,

					unsigned long *strategy_parameter)
@@ -64,6 +65,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, 
	*strat = PCI_DMA_BURST_INFINITY;

	*strategy_parameter = ~0UL;

}

#endif



/*

 *	These are pretty much arbitary with the CoMEM implementation.

include/asm-i386/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static inline void pcibios_add_platform_entries(struct pci_dev *dev) 
{

}



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,

					enum pci_dma_burst_strategy *strat,

					unsigned long *strategy_parameter)
@@ -106,6 +107,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, 
	*strat = PCI_DMA_BURST_INFINITY;

	*strategy_parameter = ~0UL;

}

#endif



#endif /* __KERNEL__ */

include/asm-ia64/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ extern int pcibios_prep_mwi (struct pci_dev *); 
#define sg_dma_len(sg)		((sg)->dma_length)

#define sg_dma_address(sg)	((sg)->dma_address)



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,

					enum pci_dma_burst_strategy *strat,

					unsigned long *strategy_parameter)
@@ -98,6 +99,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, 
	*strat = PCI_DMA_BURST_MULTIPLE;

	*strategy_parameter = cacheline_size;

}

#endif



#define HAVE_PCI_MMAP

extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,