ia64/linux-2.6.18-xen.hg

changeset 307:6db518f1a141

[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 <aron@hp.com>
author Alex Williamson <alex.williamson@hp.com>
date Tue Nov 06 14:11:43 2007 -0700 (2007-11-06)
parents 5a6837bc5808
children f539cd7c9331
files arch/ia64/hp/common/sba_iommu.c
line diff
     1.1 --- a/arch/ia64/hp/common/sba_iommu.c	Mon Nov 05 15:02:50 2007 +0000
     1.2 +++ b/arch/ia64/hp/common/sba_iommu.c	Tue Nov 06 14:11:43 2007 -0700
     1.3 @@ -944,8 +944,8 @@ sba_map_single(struct device *dev, void 
     1.4  	/*
     1.5   	** Check if the PCI device can DMA to ptr... if so, just return ptr
     1.6   	*/
     1.7 -	if (likely(pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 &&
     1.8 -		   !range_straddles_page_boundary(__pa(addr), size)) {
     1.9 +	if (likely((pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 &&
    1.10 +                   !range_straddles_page_boundary(__pa(addr), size))) {
    1.11  		/*
    1.12   		** Device is bit capable of DMA'ing to the buffer...
    1.13  		** just return the PCI address of ptr