From patchwork Tue May 7 05:52:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 241986 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C541D2C0155 for ; Tue, 7 May 2013 15:53:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756562Ab3EGFwy (ORCPT ); Tue, 7 May 2013 01:52:54 -0400 Received: from mga14.intel.com ([143.182.124.37]:9225 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258Ab3EGFwx (ORCPT ); Tue, 7 May 2013 01:52:53 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 06 May 2013 22:52:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,625,1363158000"; d="scan'208";a="298673665" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.12.246]) by azsmga001.ch.intel.com with ESMTP; 06 May 2013 22:52:51 -0700 From: Jeff Kirsher To: davem@davemloft.net, torvalds@linux-foundation.org Cc: Bruce Allan , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, linux-kernel@vger.kernel.org, Jeff Kirsher Subject: [net] e1000e: fix scheduling while atomic bug Date: Mon, 6 May 2013 22:52:47 -0700 Message-Id: <1367905967-12824-1-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.7.11.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bruce Allan 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 Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Acked-by: David S. Miller --- 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; }