tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Paul Menage and committed by
Linus Torvalds ab420e6d 47749b14

+2 -4
-1
arch/um/drivers/slip_kern.c
··· 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;
-1
arch/um/drivers/slirp_kern.c
··· 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;
+2 -2
arch/um/include/asm/dma-mapping.h
··· 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();