[PATCH 4/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-io.c

[James Nelson <james4765@xxxxxxxxxxx>]

Signed-off-by: James Nelson <james4765@xxxxxxxxx>

diff -urN --exclude='*~' linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-io.c linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-io.c
--- linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-io.c	2005-01-16 07:17:19.000000000 -0500
+++ linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-io.c	2005-01-16 07:32:19.293557207 -0500
@@ -95,15 +95,15 @@
 
 		TRACE(ft_t_any, "%d msec, %d ticks", time/1000, ticks);
 		timeout = ticks;
-		save_flags(flags);
-		sti();
+		local_save_flags(flags);
+		local_irq_enable();
 		msleep_interruptible(jiffies_to_msecs(timeout));
 		/*  Mmm. Isn't current->blocked == 0xffffffff ?
 		 */
 		if (signal_pending(current)) {
 			TRACE(ft_t_err, "awoken by non-blocked signal :-(");
 		}
-		restore_flags(flags);
+		local_irq_restore(flags);
 	}
 	TRACE_EXIT;
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/