Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix PCI DMA flag propagation on SN (Altix) with PICs
This commit is contained in:
commit
ba933beb11
|
@ -135,11 +135,10 @@ pcibr_dmatrans_direct64(struct pcidev_info * info, u64 paddr,
|
||||||
if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)
|
if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)
|
||||||
pci_addr = IS_PIC_SOFT(pcibus_info) ?
|
pci_addr = IS_PIC_SOFT(pcibus_info) ?
|
||||||
PHYS_TO_DMA(paddr) :
|
PHYS_TO_DMA(paddr) :
|
||||||
PHYS_TO_TIODMA(paddr) | dma_attributes;
|
PHYS_TO_TIODMA(paddr);
|
||||||
else
|
else
|
||||||
pci_addr = IS_PIC_SOFT(pcibus_info) ?
|
pci_addr = paddr;
|
||||||
paddr :
|
pci_addr |= dma_attributes;
|
||||||
paddr | dma_attributes;
|
|
||||||
|
|
||||||
/* Handle Bus mode */
|
/* Handle Bus mode */
|
||||||
if (IS_PCIX(pcibus_info))
|
if (IS_PCIX(pcibus_info))
|
||||||
|
|
Loading…
Reference in a new issue