UML: Fix some apparent bitrot
PATCH 1/1 UML: Fix some apparent bitrot
UML: Fix some apparent bitrot
- migration of net_device methods into net_device_ops
- dma_sync_single() changes
--
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'
---
arch/um/drivers/slip_kern.c | 1 - arch/um/drivers/slirp_kern.c | 1 - arch/um/include/asm/dma-mapping.h | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-)
arch/um/drivers/slip_kern.c +0 -1
@@ -30,7 +30,6 @@ static void slip_init(struct net_device *dev, void *data)slip_proto_init (&spri->slip); - dev->init =NULL ; dev->hard_header_len =0 ; dev->header_ops =NULL ; dev->addr_len =0 ;
arch/um/drivers/slirp_kern.c +0 -1
@@ -32,7 +32,6 @@ void slirp_init(struct net_device *dev, void *data)slip_proto_init (&spri->slip); - dev->init =NULL ; dev->hard_header_len =0 ; dev->header_ops =NULL ; dev->addr_len =0 ;
arch/um/include/asm/dma-mapping.h +2 -2
@@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, }static inline void -dma_sync_single (struct device *dev,dma_addr_t dma_handle,size_t size, +dma_sync_single_for_cpu (struct device *dev,dma_addr_t dma_handle,size_t size,enum dma_data_direction direction) {BUG (); }static inline void -dma_sync_sg (struct device *dev,struct scatterlist *sg,int nelems, +dma_sync_sg_for_cpu (struct device *dev,struct scatterlist *sg,int nelems,enum dma_data_direction direction) {BUG ();
Quoted 6 lines · Paul Menage
UML: Fix some apparent bitrot
- migration of
net_devicemethods intonet_device_ops
-dma_sync_single()changesSigned-off-by Paul Menage <[email protected]>
ACK for these two.
Thanks, Paul!
Andrew, please take these two patches for UML.
Quoted 75 lines
--
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 hereinclude/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 hereinclude/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: 'structnet_device' has no member named 'init'---
arch/um/drivers/slip_kern.c | 1 - arch/um/drivers/slirp_kern.c | 1 - arch/um/include/asm/dma-mapping.h | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-)arch/um/drivers/slip_kern.c +0
-1@@ -30,7 +30,6 @@ static void slip_init(struct net_device *dev, void *data)slip_proto_init (&spri->slip); - dev->init =NULL ; dev->hard_header_len =0 ; dev->header_ops =NULL ; dev->addr_len =0 ;arch/um/drivers/slirp_kern.c +0
-1@@ -32,7 +32,6 @@ void slirp_init(struct net_device *dev, void *data)slip_proto_init (&spri->slip); - dev->init =NULL ; dev->hard_header_len =0 ; dev->header_ops =NULL ; dev->addr_len =0 ;arch/um/include/asm/dma-mapping.h +0
-0@@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, }static inline void
arch/um/include/asm/dma-mapping.h +1
-1-dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size, +dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,enum
dma_data_directiondirection){ BUG(); }static inline void
arch/um/include/asm/dma-mapping.h +1
-1-dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems, +dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,enum
dma_data_directiondirection){ BUG();