From: Grant Likely <grant.likely@secretlab.ca>
To: linux-kernel@vger.kernel.org, Jens@secretlab.ca,
"Axboe <jens.axboe"@oracle.com, linuxppc-dev@ozlabs.org,
Linus Torvalds <torvalds@linux-foundation.org>,
paulus@samba.org
Subject: [PATCH] Bugfix to commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15
Date: Tue, 23 Oct 2007 09:20:25 -0600 [thread overview]
Message-ID: <20071023151929.12090.3835.stgit@trillian.cg.shawcable.net> (raw)
From: Grant Likely <grant.likely@secretlab.ca>
Fixup for commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15. Changes to
dma_map_sg where done in asm-x86/dma-mapping_32.h, but were not mirrored
in include/asm-powerpc/dma-mapping.h
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
Linus, I cannot build an arch/powerpc kernel without this patch.
Cheers,
g.
include/asm-powerpc/dma-mapping.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
index 65be95d..fd33ce4 100644
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
@@ -285,9 +285,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
BUG_ON(direction == DMA_NONE);
for_each_sg(sgl, sg, nents, i) {
- BUG_ON(!sg->page);
+ BUG_ON(!sg_page(sg));
__dma_sync_page(sg->page, sg->offset, sg->length, direction);
- sg->dma_address = page_to_bus(sg->page) + sg->offset;
+ sg->dma_address = sg_phys(sg);
}
return nents;
next reply other threads:[~2007-10-23 15:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-23 15:20 Grant Likely [this message]
2007-10-23 15:27 ` Josh Boyer
2007-10-23 15:35 ` Grant Likely
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=20071023151929.12090.3835.stgit@trillian.cg.shawcable.net \
--to=grant.likely@secretlab.ca \
--cc="Axboe <jens.axboe"@oracle.com \
--cc=Jens@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®