From: Alex Williamson Date: Tue, 6 Nov 2007 21:11:43 +0000 (-0700) Subject: [IA64] Re-add parens lost when paravirtualized X-Git-Tag: xen-3.2.0~92 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf5b2f1d6a53736e165a700c7e1282f255fbc9bb;p=legacy%2Flinux-2.6.18-xen.git [IA64] Re-add parens lost when paravirtualized Changeset a08261650b8a lost a set of parens for likely: - if (likely((pci_addr & ~to_pci_dev(dev)->dma_mask) == 0)) { + if (likely(pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 && + !range_straddles_page_boundary(addr, size)) { These could go back around the original test or surrouding both. To facilitate the fast path, I think it makes sense to include both. Signed-off-by: Aron Griffis --- diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 4c0c58bb..797462af 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -944,8 +944,8 @@ sba_map_single(struct device *dev, void *addr, size_t size, int dir) /* ** Check if the PCI device can DMA to ptr... if so, just return ptr */ - if (likely(pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 && - !range_straddles_page_boundary(__pa(addr), size)) { + if (likely((pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 && + !range_straddles_page_boundary(__pa(addr), size))) { /* ** Device is bit capable of DMA'ing to the buffer... ** just return the PCI address of ptr