Linux IA64 platform development
 help / color / mirror / Atom feed
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: linux-ia64@vger.kernel.org
Subject: Re: [PATCH] move consistent_dma_mask to the generic device
Date: Mon, 15 Mar 2004 21:39:20 +0000	[thread overview]
Message-ID: <200403151439.20917.bjorn.helgaas@hp.com> (raw)

The patch that moved and renamed consistent_dma_mask neglected
to fix up arch/ia64/hp/common/sba_iommu.c.  I think we need the
attached patch (booted, but not otherwise tested):

=== arch/ia64/hp/common/sba_iommu.c 1.38 vs edited ==--- 1.38/arch/ia64/hp/common/sba_iommu.c	Fri Feb 27 03:16:24 2004
+++ edited/arch/ia64/hp/common/sba_iommu.c	Mon Mar 15 14:29:15 2004
@@ -1055,13 +1055,13 @@
 	*dma_handle = virt_to_phys(addr);
 
 #ifdef ALLOW_IOV_BYPASS
-	ASSERT(to_pci_dev(dev)->consistent_dma_mask);
+	ASSERT(to_pci_dev(dev)->dev.coherent_dma_mask);
 	/*
  	** Check if the PCI device can DMA to ptr... if so, just return ptr
  	*/
-	if (likely((*dma_handle & ~to_pci_dev(dev)->consistent_dma_mask) = 0)) {
+	if (likely((*dma_handle & ~to_pci_dev(dev)->dev.coherent_dma_mask) = 0)) {
 		DBG_BYPASS("sba_alloc_coherent() bypass mask/addr: 0x%lx/0x%lx\n",
-		           to_pci_dev(dev)->consistent_dma_mask, *dma_handle);
+		           to_pci_dev(dev)->dev.coherent_dma_mask, *dma_handle);
 
 		return addr;
 	}


             reply	other threads:[~2004-03-15 21:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-03-15 21:39 Bjorn Helgaas [this message]
2004-03-15 21:48 ` [PATCH] move consistent_dma_mask to the generic device James Bottomley
2004-03-15 21:55 ` Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200403151439.20917.bjorn.helgaas@hp.com \
    --to=bjorn.helgaas@hp.com \
    --cc=linux-ia64@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox