From e788915fcc2e8822108d525bc7a35e45e8c58dc6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Oct 2008 09:18:17 -0700
Subject: [PATCH] --- yaml --- r: 110143 b: refs/heads/master c:
 95b866d5afcafee00fc9ad70665e48c86d8c4e0f h: refs/heads/master i:   110141:
 34efe931924b472aea586a8682c66213d761aed4   110139:
 e06bdb4e4eb790d7c69981d5c87729036f92efe9   110135:
 75f6c7596dbbfda7bb01ca4fd2afbd2adb002ef1   110127:
 f50a8d008f25a43db853d4cf594343ca41bafdab   110111:
 c6a9995c56538755140a9241c6e20f323e3d7605   110079:
 8578b17a5e535e1f7704e116e6d2b99b1dc32e1c v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/e1000e/ich8lan.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bbb2323f1f2b..22d666745189 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5ff7df3df9efab511244d5a299fce706c71af48
+refs/heads/master: 95b866d5afcafee00fc9ad70665e48c86d8c4e0f
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
index 0b6095ba3ce9..bcd2bc477af2 100644
--- a/trunk/drivers/net/e1000e/ich8lan.c
+++ b/trunk/drivers/net/e1000e/ich8lan.c
@@ -396,7 +396,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 	u32 extcnf_ctrl;
 	u32 timeout = PHY_CFG_TIMEOUT;
 
-	WARN_ON(preempt_count());
+	might_sleep();
 
 	if (!mutex_trylock(&nvm_mutex)) {
 		WARN(1, KERN_ERR "e1000e mutex contention. Owned by pid %d\n",