linux-next: build failure after merge of the net-next tree

[Stephen Rothwell]

Hi all,

After merging the net-next tree, today's linux-next build (sparc64
defconfig) failed like this:

net/socket.o: In function `tun_xdp_to_ptr':
(.text+0x3180): multiple definition of `tun_xdp_to_ptr'
fs/compat_ioctl.o:compat_ioctl.c:(.text+0x0): first defined here
net/socket.o: In function `tun_ptr_to_xdp':
(.text+0x31a0): multiple definition of `tun_ptr_to_xdp'
fs/compat_ioctl.o:compat_ioctl.c:(.text+0x20): first defined here

Caused by commit

  fc72d1d54dd9 ("tuntap: XDP transmission")

I applied the following fix for today:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 10 Jan 2018 15:01:41 +1100
Subject: [PATCH] tuntap: fix for "tuntap: XDP transmission"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/if_tun.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 08e66827ad8e..c5b0a75a7812 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -42,11 +42,11 @@ static inline bool tun_is_xdp_buff(void *ptr)
 {
 	return false;
 }
-void *tun_xdp_to_ptr(void *ptr)
+static inline void *tun_xdp_to_ptr(void *ptr)
 {
 	return NULL;
 }
-void *tun_ptr_to_xdp(void *ptr)
+static inline void *tun_ptr_to_xdp(void *ptr)
 {
 	return NULL;
 }
-- 
2.15.1




-- 
Cheers,
Stephen Rothwell