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

Commit ba933beb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 81d1ab82 c63c5805

arch/ia64/sn/pci/pcibr/pcibr_dma.c

+3 −4
Original line number Diff line number Diff line
@@ -135,11 +135,10 @@ pcibr_dmatrans_direct64(struct pcidev_info * info, u64 paddr, 
	if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)

		pci_addr = IS_PIC_SOFT(pcibus_info) ?

				PHYS_TO_DMA(paddr) :

		    		PHYS_TO_TIODMA(paddr) | dma_attributes;

				PHYS_TO_TIODMA(paddr);

	else

		pci_addr = IS_PIC_SOFT(pcibus_info) ?

				paddr :

				paddr | dma_attributes;

		pci_addr = paddr;

	pci_addr |= dma_attributes;



	/* Handle Bus mode */

	if (IS_PCIX(pcibus_info))