From f18978bbf267036ed41f8d0fb2cf7c05eb726a18 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 27 Aug 2006 01:23:56 -0700
Subject: [PATCH] --- yaml --- r: 33651 b: refs/heads/master c:
 36e8e5783297fbb83bdebe7e245ef659958f23cb h: refs/heads/master i:   33649:
 f24965b5f287d69db97a951ccf3ce4e9e8740e98   33647:
 0e0c5ad96edae0b05527b0e2c7e6e1fa6b19ff1b v: v3

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

diff --git a/[refs] b/[refs]
index cfce27f8f2a6..b969915a9bb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e54bdaa9cf55d7e74409ea288b705c144b2627e
+refs/heads/master: 36e8e5783297fbb83bdebe7e245ef659958f23cb
diff --git a/trunk/drivers/scsi/ide-scsi.c b/trunk/drivers/scsi/ide-scsi.c
index f7b5d7372d26..94d1de55607f 100644
--- a/trunk/drivers/scsi/ide-scsi.c
+++ b/trunk/drivers/scsi/ide-scsi.c
@@ -517,7 +517,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
 		/* No more interrupts */
 		if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
 			printk (KERN_INFO "Packet command completed, %d bytes transferred\n", pc->actually_transferred);
-		local_irq_enable();
+		local_irq_enable_in_hardirq();
 		if (status.b.check)
 			rq->errors++;
 		idescsi_end_request (drive, 1, 0);