| Message ID | 1367905967-12824-1-git-send-email-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Mon, 6 May 2013 22:52:47 -0700 > From: Bruce Allan <bruce.w.allan@intel.com> > > A scheduling while atomic bug was introduced recently (by commit ce43a216 > e1000e: cleanup USLEEP_RANGE checkpatch checks). Revert the particular > instance of usleep_range() which causes the bug. > > Reported-by: Maarten Lankhorst <m.b.lankhorst@gmail.com> > Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Linus, please apply this directly, thanks: Acked-by: David S. Miller <davem@davemloft.net> > --- > drivers/net/ethernet/intel/e1000e/e1000.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h > index 82f1c84..ffbc08f 100644 > --- a/drivers/net/ethernet/intel/e1000e/e1000.h > +++ b/drivers/net/ethernet/intel/e1000e/e1000.h > @@ -600,7 +600,7 @@ static inline s32 __ew32_prepare(struct e1000_hw *hw) > s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT; > > while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i) > - usleep_range(50, 100); > + udelay(50); > > return i; > } > -- > 1.7.11.7 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h index 82f1c84..ffbc08f 100644 --- a/drivers/net/ethernet/intel/e1000e/e1000.h +++ b/drivers/net/ethernet/intel/e1000e/e1000.h @@ -600,7 +600,7 @@ static inline s32 __ew32_prepare(struct e1000_hw *hw) s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT; while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i) - usleep_range(50, 100); + udelay(50); return i; }