From: Mark Huth Current e1000_xmit_frame spews raw interrupt disabled nag messages when used with RT kernel patches. This patch uses spin_trylock_irqsave, which allows RT patches to properly manage the irq semantics. Signed-off-by: Mark Huth Signed-off-by: Auke Kok Signed-off-by: Andrew Morton --- drivers/net/e1000/e1000_main.c | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) diff -puN drivers/net/e1000/e1000_main.c~e1000-fix-stop-raw-interrupts-disabled-nag-from-rt drivers/net/e1000/e1000_main.c --- a/drivers/net/e1000/e1000_main.c~e1000-fix-stop-raw-interrupts-disabled-nag-from-rt +++ a/drivers/net/e1000/e1000_main.c @@ -3378,12 +3378,9 @@ e1000_xmit_frame(struct sk_buff *skb, st (adapter->hw.mac_type == e1000_82573)) e1000_transfer_dhcp_info(adapter, skb); - local_irq_save(flags); - if (!spin_trylock(&tx_ring->tx_lock)) { + if (!spin_trylock_irqsave(&tx_ring->tx_lock, flags)) /* Collision - tell upper layer to requeue */ - local_irq_restore(flags); return NETDEV_TX_LOCKED; - } /* need: count + 2 desc gap to keep tail from touching * head, otherwise try next time */ _