Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / drivers / net / ethernet / 3com / 3c59x.c

diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 9133e7926da53050c0614c15924655eb0330dae5..63afb921ed40a534bc8008ba115ec14f77c3956f 100644 (file)
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -842,9 +842,9 @@ static void poll_vortex(struct net_device *dev)
 {
        struct vortex_private *vp = netdev_priv(dev);
        unsigned long flags;
-       local_irq_save(flags);
+       local_irq_save_nort(flags);
        (vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
-       local_irq_restore(flags);
+       local_irq_restore_nort(flags);
 }
 #endif
 
@@ -1910,12 +1910,12 @@ static void vortex_tx_timeout(struct net_device *dev)
                         * Block interrupts because vortex_interrupt does a bare spin_lock()
                         */
                        unsigned long flags;
-                       local_irq_save(flags);
+                       local_irq_save_nort(flags);
                        if (vp->full_bus_master_tx)
                                boomerang_interrupt(dev->irq, dev);
                        else
                                vortex_interrupt(dev->irq, dev);
-                       local_irq_restore(flags);
+                       local_irq_restore_nort(flags);
                }
        }