From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 8 Apr 2008 16:20:47 +0000 (-0300)
Subject: x86: use sg_phys in x86_64
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=30db2cbf38d68f466fd34488f8312a151225c9ac;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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,
 
 	for_each_sg(sg, s, nents, i) {
 		BUG_ON(!sg_page(s));
-		s->dma_address = virt_to_bus(sg_virt(s));
+		s->dma_address = sg_phys(s);
 		if (!check_addr("map_sg", hwdev, s->dma_address, s->length))
 			return 0;
 		s->dma_length = s->length;