[Xen-changelog] [linux-2.6.18-xen] [IA64] Re-add parens lost when paravirtualized

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1194383503 25200
# Node ID 6db518f1a141a419bf0a20d32178439bf5462818
# Parent  5a6837bc5808b935c652dbfa6d5a1a79db23bb14
[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@xxxxxx>
---
 arch/ia64/hp/common/sba_iommu.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 5a6837bc5808 -r 6db518f1a141 arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/hp/common/sba_iommu.c   Mon Nov 05 15:02:50 2007 +0000
+++ b/arch/ia64/hp/common/sba_iommu.c   Tue Nov 06 14:11:43 2007 -0700
@@ -944,8 +944,8 @@ sba_map_single(struct device *dev, void 
        /*
        ** 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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog