# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.635   -> 1.636  
#	drivers/ide24/ide-disk.c	1.1     -> 1.2    
#	drivers/ide24/ide-probe.c	1.1     -> 1.2    
#	include/linux/ide24.h	1.2     -> 1.3    
#	 drivers/ide24/ide.c	1.1     -> 1.2    
#	drivers/ide24/ide-taskfile.c	1.1     -> 1.2    
#	drivers/ide24/ide-pmac.c	1.1     -> 1.2    
#	drivers/ide24/ide-cd.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/11	axboe@burns.home.kernel.dk	1.636
# local_irq_save() -> local_irq_set()
# --------------------------------------------
#
diff -Nru a/drivers/ide24/ide-cd.c b/drivers/ide24/ide-cd.c
--- a/drivers/ide24/ide-cd.c	Thu Jul 11 11:14:18 2002
+++ b/drivers/ide24/ide-cd.c	Thu Jul 11 11:14:18 2002
@@ -580,7 +580,7 @@
 	unsigned long flags;
 	byte err = 0;
 
-	local_irq_save(flags);
+	local_irq_set(flags);
 	printk("%s: %s: status=0x%02x", drive->name, msg, stat);
 #if FANCY_STATUS_DUMPS
 	printk(" { ");
diff -Nru a/drivers/ide24/ide-disk.c b/drivers/ide24/ide-disk.c
--- a/drivers/ide24/ide-disk.c	Thu Jul 11 11:14:18 2002
+++ b/drivers/ide24/ide-disk.c	Thu Jul 11 11:14:18 2002
@@ -783,7 +783,7 @@
 	unsigned long flags;
 	byte err = 0;
 
-	local_irq_save(flags);
+	local_irq_set(flags);
 	printk("%s: %s: status=0x%02x", drive->name, msg, stat);
 #if FANCY_STATUS_DUMPS
 	printk(" { ");
diff -Nru a/drivers/ide24/ide-pmac.c b/drivers/ide24/ide-pmac.c
--- a/drivers/ide24/ide-pmac.c	Thu Jul 11 11:14:18 2002
+++ b/drivers/ide24/ide-pmac.c	Thu Jul 11 11:14:18 2002
@@ -384,7 +384,7 @@
 	OUT_BYTE(SETFEATURES_XFER, IDE_FEATURE_REG);
 	OUT_BYTE(WIN_SETFEATURES, IDE_COMMAND_REG);
 	udelay(1);
-	local_irq_save(flags);
+	local_irq_set(flags);
 	result = wait_for_ready(drive, 2000);	/* Timeout bumped for some powerbooks */
 	local_irq_restore(flags);
 	OUT_BYTE(drive->ctl, IDE_CONTROL_REG);
diff -Nru a/drivers/ide24/ide-probe.c b/drivers/ide24/ide-probe.c
--- a/drivers/ide24/ide-probe.c	Thu Jul 11 11:14:18 2002
+++ b/drivers/ide24/ide-probe.c	Thu Jul 11 11:14:18 2002
@@ -548,7 +548,7 @@
 		return;	
 	}
 
-	local_irq_save(flags);
+	local_irq_set(flags);
 	/*
 	 * Second drive should only exist if first drive was found,
 	 * but a lot of cdrom drives are configured as single slaves.
diff -Nru a/drivers/ide24/ide-taskfile.c b/drivers/ide24/ide-taskfile.c
--- a/drivers/ide24/ide-taskfile.c	Thu Jul 11 11:14:18 2002
+++ b/drivers/ide24/ide-taskfile.c	Thu Jul 11 11:14:18 2002
@@ -325,7 +325,7 @@
 
 	udelay(1);	/* spec allows drive 400ns to assert "BUSY" */
 	if ((stat = GET_STAT()) & BUSY_STAT) {
-		local_irq_save(flags);
+		local_irq_set(flags);
 		timeout += jiffies;
 		while ((stat = GET_STAT()) & BUSY_STAT) {
 			if (time_after(jiffies, timeout)) {
@@ -456,7 +456,7 @@
 	unsigned long flags;
 	byte err = 0;
 
-	local_irq_save(flags);
+	local_irq_set(flags);
 	printk("%s: %s: status=0x%02x", drive->name, msg, stat);
 #if FANCY_STATUS_DUMPS
 	printk(" { ");
@@ -2569,7 +2569,7 @@
 	 */
 	if ((stat = GET_STAT()) & BUSY_STAT) {
 		unsigned long flags, timeout;
-		local_irq_save(flags);
+		local_irq_set(flags);
 		timeout = jiffies + WAIT_CMD;
 		while ((stat = GET_STAT()) & BUSY_STAT) {
 			if (time_after(jiffies, timeout))
diff -Nru a/drivers/ide24/ide.c b/drivers/ide24/ide.c
--- a/drivers/ide24/ide.c	Thu Jul 11 11:14:18 2002
+++ b/drivers/ide24/ide.c	Thu Jul 11 11:14:18 2002
@@ -769,7 +769,7 @@
 	unsigned long flags;
 	byte err = 0;
 
-	local_irq_save(flags);
+	local_irq_set(flags);
 	printk("%s: %s: status=0x%02x", drive->name, msg, stat);
 #if FANCY_STATUS_DUMPS
 	printk(" { ");
@@ -2349,7 +2349,7 @@
 	while (hwgroup->busy) {
 		unsigned long lflags;
 		spin_unlock_irq(&ide_lock);
-		local_irq_save(lflags);
+		local_irq_set(lflags);
 		if (time_after(jiffies, timeout)) {
 			local_irq_restore(lflags);
 			printk("%s: channel busy\n", drive->name);
diff -Nru a/include/linux/ide24.h b/include/linux/ide24.h
--- a/include/linux/ide24.h	Thu Jul 11 11:14:18 2002
+++ b/include/linux/ide24.h	Thu Jul 11 11:14:18 2002
@@ -1327,4 +1327,6 @@
 
 #define DRIVE_LOCK(drive)	((drive)->queue.queue_lock)
 
+#define local_irq_set(flags)	do { __save_flags((flags)); __sti(); } while (0)
+
 #endif /* _IDE_H */