[PATCH 5/13] generic_serial: remove cli()/sti() in drivers/char/generic_serial.c

[James Nelson]

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

diff -urN --exclude='*~' linux-2.6.11-rc1-mm1-original/drivers/char/generic_serial.c linux-2.6.11-rc1-mm1/drivers/char/generic_serial.c
--- linux-2.6.11-rc1-mm1-original/drivers/char/generic_serial.c	2005-01-16 07:19:12.000000000 -0500
+++ linux-2.6.11-rc1-mm1/drivers/char/generic_serial.c	2005-01-16 07:32:19.299556404 -0500
@@ -53,8 +53,8 @@
 #define RELEASEIT up (&port->port_write_sem);
 #else
 #define DECL      unsigned long flags;
-#define LOCKIT    save_flags (flags);cli ()
-#define RELEASEIT restore_flags (flags)
+#define LOCKIT    local_irq_save (flags)
+#define RELEASEIT local_irq_restore (flags)
 #endif
 
 #define RS_EVENT_WRITE_WAKEUP	1
@@ -211,7 +211,7 @@
 
 	local_save_flags(flags);
 	while (1) {
-		cli();
+		local_irq_disable();
 		c = count;
 
 		/* This is safe because we "OWN" the "head". Noone else can 
-
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/