Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d741bde26dc3444eaeb269051d3f0b623b24de13

Authored by Glauber Costa
Committed by Ingo Molnar
1 parent 5b3e5b7273
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

x86: use dma_length in i386 

This is done to get the code closer to x86_64.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 2 changed files with 1 additions and 2 deletions Side-by-side Diff

arch/x86/kernel/pci-base_32.c
Diff comments   View file @ d741bde
... ... @@ -24,6 +24,7 @@
24 24 BUG_ON(!sg_page(sg));
25 25  
26 26 sg->dma_address = sg_phys(sg);
  27 + sg->dma_length = sg->length;
27 28 }
28 29  
29 30 flush_write_buffers();
include/asm-x86/scatterlist.h
Diff comments   View file @ d741bde
... ... @@ -11,9 +11,7 @@
11 11 unsigned int offset;
12 12 unsigned int length;
13 13 dma_addr_t dma_address;
14   -#ifdef CONFIG_X86_64
15 14 unsigned int dma_length;
16   -#endif
17 15 };
18 16  
19 17 #define ARCH_HAS_SG_CHAIN