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> |
||
|---|---|---|
| .. | ||
| chan_kern.c | ||
| chan_user.c | ||
| cow_sys.h | ||
| cow_user.c | ||
| cow.h | ||
| daemon_kern.c | ||
| daemon_user.c | ||
| daemon.h | ||
| fd.c | ||
| harddog_kern.c | ||
| harddog_user.c | ||
| hostaudio_kern.c | ||
| line.c | ||
| Makefile | ||
| mcast_kern.c | ||
| mcast_user.c | ||
| mcast.h | ||
| mconsole_kern.c | ||
| mconsole_user.c | ||
| mmapper_kern.c | ||
| net_kern.c | ||
| net_user.c | ||
| null.c | ||
| pcap_kern.c | ||
| pcap_user.c | ||
| pcap_user.h | ||
| port_kern.c | ||
| port_user.c | ||
| port.h | ||
| pty.c | ||
| random.c | ||
| slip_common.c | ||
| slip_common.h | ||
| slip_kern.c | ||
| slip_user.c | ||
| slip.h | ||
| slirp_kern.c | ||
| slirp_user.c | ||
| slirp.h | ||
| ssl.c | ||
| ssl.h | ||
| stderr_console.c | ||
| stdio_console.c | ||
| stdio_console.h | ||
| tty.c | ||
| ubd_kern.c | ||
| ubd_user.c | ||
| vde_kern.c | ||
| vde_user.c | ||
| vde.h | ||
| xterm_kern.c | ||
| xterm.c | ||
| xterm.h | ||