diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:15:16 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:15:28 +0000 |
| commit | 0cf6719e1d2f19f831279583065810ceb5ecbd28 (patch) | |
| tree | 34052095977dde7bec44b99f60acc8bb77325f76 /debian/patches-rt/0339-net-Add-missing-xmit_lock_owner-hunks.patch | |
| parent | Merging upstream version 4.19.282. (diff) | |
| download | linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.tar.xz linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.zip | |
Merging debian version 4.19.282-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0339-net-Add-missing-xmit_lock_owner-hunks.patch')
| -rw-r--r-- | debian/patches-rt/0339-net-Add-missing-xmit_lock_owner-hunks.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0339-net-Add-missing-xmit_lock_owner-hunks.patch b/debian/patches-rt/0339-net-Add-missing-xmit_lock_owner-hunks.patch index 8fc335457..c1dc24eee 100644 --- a/debian/patches-rt/0339-net-Add-missing-xmit_lock_owner-hunks.patch +++ b/debian/patches-rt/0339-net-Add-missing-xmit_lock_owner-hunks.patch @@ -1,7 +1,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Wed, 22 Dec 2021 20:35:22 +0100 -Subject: [PATCH 339/351] net: Add missing xmit_lock_owner hunks. -Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=42062a2e27ad3a9da95ef7c4c799c1ca71a6bd66 +Subject: [PATCH 339/353] net: Add missing xmit_lock_owner hunks. +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=28fb4ed75c1321223af40de2e3ed096553ad15ea The patch net: move xmit_recursion to per-task variable on -RT @@ -17,10 +17,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index c4713217b20e..bd73117e2636 100644 +index 086cd650f555..25557901d020 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -3885,17 +3885,17 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits) +@@ -3887,17 +3887,17 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits) #ifdef CONFIG_PREEMPT_RT_FULL static inline void netdev_queue_set_owner(struct netdev_queue *txq, int cpu) { @@ -41,7 +41,7 @@ index c4713217b20e..bd73117e2636 100644 return true; return false; } -@@ -3904,17 +3904,19 @@ static inline bool netdev_queue_has_owner(struct netdev_queue *txq) +@@ -3906,17 +3906,19 @@ static inline bool netdev_queue_has_owner(struct netdev_queue *txq) static inline void netdev_queue_set_owner(struct netdev_queue *txq, int cpu) { @@ -64,7 +64,7 @@ index c4713217b20e..bd73117e2636 100644 return true; return false; } -@@ -3923,8 +3925,7 @@ static inline bool netdev_queue_has_owner(struct netdev_queue *txq) +@@ -3925,8 +3927,7 @@ static inline bool netdev_queue_has_owner(struct netdev_queue *txq) static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu) { spin_lock(&txq->_xmit_lock); @@ -74,7 +74,7 @@ index c4713217b20e..bd73117e2636 100644 } static inline bool __netif_tx_acquire(struct netdev_queue *txq) -@@ -3941,8 +3942,7 @@ static inline void __netif_tx_release(struct netdev_queue *txq) +@@ -3943,8 +3944,7 @@ static inline void __netif_tx_release(struct netdev_queue *txq) static inline void __netif_tx_lock_bh(struct netdev_queue *txq) { spin_lock_bh(&txq->_xmit_lock); @@ -84,7 +84,7 @@ index c4713217b20e..bd73117e2636 100644 } static inline bool __netif_tx_trylock(struct netdev_queue *txq) -@@ -3950,23 +3950,20 @@ static inline bool __netif_tx_trylock(struct netdev_queue *txq) +@@ -3952,23 +3952,20 @@ static inline bool __netif_tx_trylock(struct netdev_queue *txq) bool ok = spin_trylock(&txq->_xmit_lock); if (likely(ok)) { |