Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262632AbVAPWXq (ORCPT ); Sun, 16 Jan 2005 17:23:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262634AbVAPWRi (ORCPT ); Sun, 16 Jan 2005 17:17:38 -0500 Received: from clock-tower.bc.nu ([81.2.110.250]:45701 "EHLO localhost.localdomain") by vger.kernel.org with ESMTP id S262630AbVAPWPZ (ORCPT ); Sun, 16 Jan 2005 17:15:25 -0500 Subject: Re: [PATCH 4/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-io.c From: Alan Cox To: James Nelson Cc: Linux Kernel Mailing List , kernel-janitors@lists.osdl.org, akpm@osdl.org In-Reply-To: <20050116135250.30109.31739.53624@localhost.localdomain> References: <20050116135223.30109.26479.55757@localhost.localdomain> <20050116135250.30109.31739.53624@localhost.localdomain> Content-Type: text/plain Content-Transfer-Encoding: 7bit Message-Id: <1105908349.12201.11.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 (1.4.6-2) Date: Sun, 16 Jan 2005 21:11:00 +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1016 Lines: 23 On Sul, 2005-01-16 at 13:52, James Nelson wrote: > Signed-off-by: James Nelson > > 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)); This doesn't deal with SMP - please reject - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/