ab420e6d9c
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> |
||
|---|---|---|
| .. | ||
| a.out-core.h | ||
| apic.h | ||
| auxvec.h | ||
| bugs.h | ||
| cache.h | ||
| checksum.h | ||
| common.lds.S | ||
| cputime.h | ||
| current.h | ||
| delay.h | ||
| desc.h | ||
| device.h | ||
| dma-mapping.h | ||
| dma.h | ||
| emergency-restart.h | ||
| fixmap.h | ||
| ftrace.h | ||
| futex.h | ||
| hardirq.h | ||
| hw_irq.h | ||
| io.h | ||
| irq.h | ||
| irq_regs.h | ||
| irq_vectors.h | ||
| irqflags.h | ||
| kdebug.h | ||
| kmap_types.h | ||
| mmu.h | ||
| mmu_context.h | ||
| mutex.h | ||
| page.h | ||
| page_offset.h | ||
| param.h | ||
| pci.h | ||
| pda.h | ||
| pgalloc.h | ||
| pgtable-2level.h | ||
| pgtable-3level.h | ||
| pgtable.h | ||
| processor-generic.h | ||
| ptrace-generic.h | ||
| required-features.h | ||
| sections.h | ||
| segment.h | ||
| setup.h | ||
| smp.h | ||
| system.h | ||
| thread_info.h | ||
| timex.h | ||
| tlb.h | ||
| tlbflush.h | ||
| topology.h | ||
| uaccess.h | ||
| xor.h | ||