git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-sparc
/
pci.h
diff --git
a/include/asm-sparc/pci.h
b/include/asm-sparc/pci.h
index
0a87b8a
..
3864474
100644
(file)
--- a/
include/asm-sparc/pci.h
+++ b/
include/asm-sparc/pci.h
@@
-15,12
+15,12
@@
#define PCI_IRQ_NONE 0xffffffff
#define PCI_IRQ_NONE 0xffffffff
-
extern
inline void pcibios_set_master(struct pci_dev *dev)
+
static
inline void pcibios_set_master(struct pci_dev *dev)
{
/* No special bus mastering setup handling */
}
{
/* No special bus mastering setup handling */
}
-
extern inline void pcibios_penalize_isa_irq(int irq
)
+
static inline void pcibios_penalize_isa_irq(int irq, int active
)
{
/* We don't do dynamic PCI IRQ allocation */
}
{
/* We don't do dynamic PCI IRQ allocation */
}
@@
-137,17
+137,34
@@
extern void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist
* only drive the low 24-bits during PCI bus mastering, then
* you would pass 0x00ffffff as the mask to this function.
*/
* only drive the low 24-bits during PCI bus mastering, then
* you would pass 0x00ffffff as the mask to this function.
*/
-
extern
inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
+
static
inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
{
return 1;
}
#define pci_dac_dma_supported(dev, mask) (0)
{
return 1;
}
#define pci_dac_dma_supported(dev, mask) (0)
+#ifdef CONFIG_PCI
+static inline void pci_dma_burst_advice(struct pci_dev *pdev,
+ enum pci_dma_burst_strategy *strat,
+ unsigned long *strategy_parameter)
+{
+ *strat = PCI_DMA_BURST_INFINITY;
+ *strategy_parameter = ~0UL;
+}
+#endif
+
static inline void pcibios_add_platform_entries(struct pci_dev *dev)
{
}
static inline void pcibios_add_platform_entries(struct pci_dev *dev)
{
}
+#define PCI_DMA_ERROR_CODE (~(dma_addr_t)0x0)
+
+static inline int pci_dma_mapping_error(dma_addr_t dma_addr)
+{
+ return (dma_addr == PCI_DMA_ERROR_CODE);
+}
+
#endif /* __KERNEL__ */
/* generic pci stuff */
#endif /* __KERNEL__ */
/* generic pci stuff */