This error was introduced in commit e6f1979ced24 ("Merge branch
'v4.19/standard/base' into v4.19/standard/preempt-rt/base").include/linux/netdevice.h:3066:19: error: redefinition of 'dev_recursion_level' | 3066 | static inline int dev_recursion_level(void) | | ^~~~~~~~~~~~~~~~~~~ include/linux/netdevice.h:2641:19: note: previous definition of 'dev_recursion_level' was here | 2641 | static inline int dev_recursion_level(void) | | ^~~~~~~~~~~~~~~~~~~ include/linux/netdevice.h:3071: warning: "XMIT_RECURSION_LIMIT" redefined | 3071 | #define XMIT_RECURSION_LIMIT include/linux/netdevice.h:2639: note: this is the location of the previous definition | 2639 | #define XMIT_RECURSION_LIMIT 10 Signed-off-by: Daniel Dragomir <[email protected]> --- include/linux/netdevice.h | 47 --------------------------------------- 1 file changed, 47 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0c5e160bc248..4b1234e58fa7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2636,53 +2636,6 @@ void netdev_freemem(struct net_device *dev); void synchronize_net(void); int init_dummy_netdev(struct net_device *dev); -#define XMIT_RECURSION_LIMIT 10 -#ifdef CONFIG_PREEMPT_RT_FULL -static inline int dev_recursion_level(void) -{ - return current->xmit_recursion; -} - -static inline int xmit_rec_read(void) -{ - return current->xmit_recursion; -} - -static inline void xmit_rec_inc(void) -{ - current->xmit_recursion++; -} - -static inline void xmit_rec_dec(void) -{ - current->xmit_recursion--; -} - -#else - -DECLARE_PER_CPU(int, xmit_recursion); - -static inline int dev_recursion_level(void) -{ - return this_cpu_read(xmit_recursion); -} - -static inline int xmit_rec_read(void) -{ - return __this_cpu_read(xmit_recursion); -} - -static inline void xmit_rec_inc(void) -{ - __this_cpu_inc(xmit_recursion); -} - -static inline void xmit_rec_dec(void) -{ - __this_cpu_dec(xmit_recursion); -} -#endif - struct net_device *dev_get_by_index(struct net *net, int ifindex); struct net_device *__dev_get_by_index(struct net *net, int ifindex); struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8807): https://lists.yoctoproject.org/g/linux-yocto/message/8807 Mute This Topic: https://lists.yoctoproject.org/mt/75389500/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
