aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-04-08 12:20:47 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 13:19:57 -0400
commit30db2cbf38d68f466fd34488f8312a151225c9ac (patch)
treea628bc1bc9c06bf4eb6a064c03bd10df094182ce /arch/x86
parente4dcdd6b4fa33efee94e89cccd75e871c570c510 (diff)
x86: use sg_phys in x86_64
To make the code usable in i386, where we have high memory mappings, we drop te virt_to_bus(sg_virt()) construction in favour of sg_phys. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/pci-nommu_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-nommu_64.c b/arch/x86/kernel/pci-nommu_64.c
index 1da9cf9be3aa..c6901e751770 100644
--- a/arch/x86/kernel/pci-nommu_64.c
+++ b/arch/x86/kernel/pci-nommu_64.c
@@ -60,7 +60,7 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,
60 60
61 for_each_sg(sg, s, nents, i) { 61 for_each_sg(sg, s, nents, i) {
62 BUG_ON(!sg_page(s)); 62 BUG_ON(!sg_page(s));
63 s->dma_address = virt_to_bus(sg_virt(s)); 63 s->dma_address = sg_phys(s);
64 if (!check_addr("map_sg", hwdev, s->dma_address, s->length)) 64 if (!check_addr("map_sg", hwdev, s->dma_address, s->length))
65 return 0; 65 return 0;
66 s->dma_length = s->length; 66 s->dma_length = s->length;