From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 10 Feb 2007 09:46:48 +0000 (-0800)
Subject: [PATCH] CHAR-Amiserial: turn local_save_flags() + local_irq_disable() into local_irq_... 
X-Git-Tag: v2.6.21-rc1~274^2~242
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3abf3beda75a10988eab4c1deab893e2d38e643e;p=~emulex%2Finfiniband.git

[PATCH] CHAR-Amiserial: turn local_save_flags() + local_irq_disable() into local_irq_save()

drivers/char/amiserial.c::rs_write() contains local_irq_disable() after
local_save_flags().  Turn it into local_irq_save().

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 39880eb58f3..0e2b72f2b88 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -902,8 +902,7 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count
 	if (!info->xmit.buf)
 		return 0;
 
-	local_save_flags(flags);
-	local_irq_disable();
+	local_irq_save(flags);
 	while (1) {
 		c = CIRC_SPACE_TO_END(info->xmit.head,
 				      info->xmit.tail,