From 7b6a5c19c40f123fd889a5c76844d1b0551b1af7 Mon Sep 17 00:00:00 2001
From: Amol Lad <amol@verismonetworks.com>
Date: Thu, 26 Apr 2007 00:35:13 -0700
Subject: [PATCH] --- yaml --- r: 55231 b: refs/heads/master c:
 e1fa0ceaf366ba8042a388d02ce841b36d063fe2 h: refs/heads/master i:   55229:
 99da9533cd97aacbf6132c65c91eeb1e48f5349d   55227:
 255c022f751c442e2b69affab908c133053dac96   55223:
 76296e9c3235799f93850f8405c574f5aa7aa492   55215:
 fb27c759f9b9862bb6481d20b052fa9b7c1525c4   55199:
 1c12c4573e4b6909307e7f18e350c64ab96ee15a   55167:
 fdc8757eeefeccb9f33ae806769c474612b7788a v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/megaraid.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f78ebadff8c1..6ae6bbd4bb4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84a3c97b93ec5b4509637801a703693bb710cd4c
+refs/heads/master: e1fa0ceaf366ba8042a388d02ce841b36d063fe2
diff --git a/trunk/drivers/scsi/megaraid.c b/trunk/drivers/scsi/megaraid.c
index 65bc130430e2..3cce75d70263 100644
--- a/trunk/drivers/scsi/megaraid.c
+++ b/trunk/drivers/scsi/megaraid.c
@@ -1754,7 +1754,8 @@ __mega_busywait_mbox (adapter_t *adapter)
 	for (counter = 0; counter < 10000; counter++) {
 		if (!mbox->m_in.busy)
 			return 0;
-		udelay(100); yield();
+		udelay(100);
+		cond_resched();
 	}
 	return -1;		/* give up after 1 second */
 }