Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ab420e6d9c2511b862d753b70efb4e979faa0714

Authored by Paul Menage
Committed by Linus Torvalds
1 parent 47749b14e5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, 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, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

UML: Fix some apparent bitrot 

UML: Fix some apparent bitrot

- migration of net_device methods into net_device_ops
- dma_sync_single() changes

Signed-off-by: Paul Menage <menage@google.com>
Acked-by: Amerigo Wang <xiyou.wangcong@gmail.com>
--

This version is split from my earlier patch, including just the
portions that ar required for Linus' tree.

Fixes the following compile errors:

include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
include/linux/dma-mapping.h: In function 'dma_sync_single':
include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
include/linux/dma-mapping.h: At top level:
include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
include/linux/dma-mapping.h: In function 'dma_sync_sg':
include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'

arch/um/drivers/slirp_kern.c: In function 'slirp_init':
arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

arch/um/drivers/slip_kern.c
Diff comments   View file @ ab420e6
... ... @@ -30,7 +30,6 @@
30 30  
31 31 slip_proto_init(&spri->slip);
32 32  
33   - dev->init = NULL;
34 33 dev->hard_header_len = 0;
35 34 dev->header_ops = NULL;
36 35 dev->addr_len = 0;
arch/um/drivers/slirp_kern.c
Diff comments   View file @ ab420e6
... ... @@ -32,7 +32,6 @@
32 32  
33 33 slip_proto_init(&spri->slip);
34 34  
35   - dev->init = NULL;
36 35 dev->hard_header_len = 0;
37 36 dev->header_ops = NULL;
38 37 dev->addr_len = 0;
arch/um/include/asm/dma-mapping.h
Diff comments   View file @ ab420e6
... ... @@ -79,14 +79,14 @@
79 79 }
80 80  
81 81 static inline void
82   -dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size,
  82 +dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
83 83 enum dma_data_direction direction)
84 84 {
85 85 BUG();
86 86 }
87 87  
88 88 static inline void
89   -dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
  89 +dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
90 90 enum dma_data_direction direction)
91 91 {
92 92 BUG();