• Paul Menage's avatar
    UML: Fix some apparent bitrot · ab420e6d
    Paul Menage authored
    UML: Fix some apparent bitrot
    
    - migration of net_device methods into net_device_ops
    - dma_sync_single() changes
    Signed-off-by: default avatarPaul Menage <menage@google.com>
    Acked-by: default avatarAmerigo 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    ab420e6d
dma-mapping.h 2.38 KB