From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: James Nelson <james4765@cwazy.co.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
kernel-janitors@lists.osdl.org, akpm@osdl.org
Subject: [KJ] Re: [PATCH 3/13] ftape: remove cli()/sti() in
Date: Sun, 16 Jan 2005 21:10:57 +0000 [thread overview]
Message-ID: <1105908296.12196.9.camel@localhost.localdomain> (raw)
In-Reply-To: <20050116135244.30109.69180.33718@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]
On Sul, 2005-01-16 at 13:52, James Nelson wrote:
> Signed-off-by: James Nelson <james4765@gmail.com>
>
> diff -urN --exclude='*~' linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-format.c linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-format.c
> --- linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-format.c 2004-12-24 16:34:45.000000000 -0500
> +++ linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-format.c 2005-01-16 07:32:19.293557207 -0500
> @@ -132,7 +132,7 @@
> TRACE_CATCH(ftape_seek_head_to_track(track),);
> TRACE_CATCH(ftape_command(QIC_LOGICAL_FORWARD),);
> spin_lock_irqsave(&ftape_format_lock, flags);
> - TRACE_CATCH(fdc_setup_formatting(head), restore_flags(flags));
> + TRACE_CATCH(fdc_setup_formatting(head),);
> spin_unlock_irqrestore(&ftape_format_lock, flags);
This is wrong (the original is too). TRACE_CATCH expands into code
including a return so you need to replace the retore_flags(flags) with a
copy of the spin_unlock_irqrestore line below
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
WARNING: multiple messages have this Message-ID (diff)
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: James Nelson <james4765@cwazy.co.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
kernel-janitors@lists.osdl.org, akpm@osdl.org
Subject: Re: [PATCH 3/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-format.c
Date: Sun, 16 Jan 2005 21:10:57 +0000 [thread overview]
Message-ID: <1105908296.12196.9.camel@localhost.localdomain> (raw)
In-Reply-To: <20050116135244.30109.69180.33718@localhost.localdomain>
On Sul, 2005-01-16 at 13:52, James Nelson wrote:
> Signed-off-by: James Nelson <james4765@gmail.com>
>
> diff -urN --exclude='*~' linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-format.c linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-format.c
> --- linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-format.c 2004-12-24 16:34:45.000000000 -0500
> +++ linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-format.c 2005-01-16 07:32:19.293557207 -0500
> @@ -132,7 +132,7 @@
> TRACE_CATCH(ftape_seek_head_to_track(track),);
> TRACE_CATCH(ftape_command(QIC_LOGICAL_FORWARD),);
> spin_lock_irqsave(&ftape_format_lock, flags);
> - TRACE_CATCH(fdc_setup_formatting(head), restore_flags(flags));
> + TRACE_CATCH(fdc_setup_formatting(head),);
> spin_unlock_irqrestore(&ftape_format_lock, flags);
This is wrong (the original is too). TRACE_CATCH expands into code
including a return so you need to replace the retore_flags(flags) with a
copy of the spin_unlock_irqrestore line below
next prev parent reply other threads:[~2005-01-16 21:10 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-16 13:52 [PATCH 0/13] remove cli()/sti() in drivers/char/* James Nelson
2005-01-16 13:52 ` [PATCH 1/13] epca: remove cli()/sti() in drivers/char/epca.c James Nelson
2005-01-16 13:52 ` [PATCH 2/13] esp: remove cli()/sti() in drivers/char/esp.c James Nelson
2005-01-16 13:52 ` [PATCH 3/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-format.c James Nelson
2005-01-16 21:10 ` Alan Cox [this message]
2005-01-16 21:10 ` Alan Cox
2005-01-16 13:52 ` [PATCH 4/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-io.c James Nelson
2005-01-16 21:11 ` [KJ] Re: [PATCH 4/13] ftape: remove cli()/sti() in Alan Cox
2005-01-16 21:11 ` [PATCH 4/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-io.c Alan Cox
2005-01-16 13:52 ` [PATCH 5/13] generic_serial: remove cli()/sti() in drivers/char/generic_serial.c James Nelson
2005-01-16 13:53 ` [PATCH 6/13] ip2: remove cli()/sti() in drivers/char/ip2main.c James Nelson
2005-01-16 13:53 ` [PATCH 7/13] istallion: remove cli()/sti() in drivers/char/istallion.c James Nelson
2005-01-16 13:53 ` [PATCH 8/13] ite_gpio: remove cli()/sti() in drivers/char/ite_gpio.c James Nelson
2005-01-16 13:53 ` [PATCH 9/13] moxa: remove cli()/sti() in drivers/char/moxa.c James Nelson
2005-01-16 13:53 ` [PATCH 10/13] pcxx: remove cli()/sti() in drivers/char/pcxx.c James Nelson
2005-01-16 13:53 ` [PATCH 11/13] riscom8: remove cli()/sti() in drivers/char/riscom8.c James Nelson
2005-01-16 13:53 ` [PATCH 12/13] serial_tx3912: remove cli()/sti() in drivers/char/serial_tx3912.c James Nelson
2005-01-16 13:53 ` [PATCH 13/13] stallion: remove cli()/sti() in drivers/char/stallion.c James Nelson
2005-01-16 19:25 ` [KJ] Re: [PATCH 0/13] remove cli()/sti() in drivers/char/* Randy.Dunlap
2005-01-16 19:25 ` Randy.Dunlap
2005-01-16 20:13 ` [KJ] " Jim Nelson
2005-01-16 20:13 ` Jim Nelson
2005-01-16 21:04 ` [KJ] " Andrew Morton
2005-01-16 21:04 ` Andrew Morton
2005-01-16 21:10 ` [KJ] " Alan Cox
2005-01-16 21:10 ` Alan Cox
2005-01-16 22:33 ` [KJ] " Jim Nelson
2005-01-16 22:33 ` Jim Nelson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1105908296.12196.9.camel@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=akpm@osdl.org \
--cc=james4765@cwazy.co.uk \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.