From: Jason Wessel <jason.wessel@windriver.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the kgdb tree
Date: Thu, 20 May 2010 20:28:54 -0500 [thread overview]
Message-ID: <4BF5E1D6.1090607@windriver.com> (raw)
In-Reply-To: <20100521012340.GA12372@core.coreip.homeip.net>
On 05/20/2010 08:23 PM, Dmitry Torokhov wrote:
> On Fri, May 21, 2010 at 11:09:38AM +1000, Stephen Rothwell wrote:
>> Hi Jason,
>>
>> On Thu, 20 May 2010 19:49:51 -0500 Jason Wessel <jason.wessel@windriver.com> wrote:
>>> Before brute force toggling it, it seems we should check the value and
>>> restore it after the execution of handle_sysrq().
>> Indeed, at the time I couldn't find an easy way to do that.
>>
>>> I'll have to look and see if there is an access function for this.
>> Great, thanks.
>
> I would not mind re-exporting sysrq_on() again.
>
We could but I don't know that you need to.
Would you be willing to sign off on a change like the one below
Dmitry? If so then I'll push it into kgdb-next.
It is as simple as making the return from sysrq_toggle_support a bit
more meaningful.
Thanks,
Jason.
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -717,7 +717,7 @@ int sysrq_toggle_support(int enable_mask
sysrq_unregister_handler();
}
- return 0;
+ return was_enabled;
}
static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1926,17 +1926,19 @@ static int kdb_rm(int argc, const char *
*/
static int kdb_sr(int argc, const char **argv)
{
+ int toggle_save;
+
if (argc != 1)
return KDB_ARGCOUNT;
- if (!__sysrq_enabled) {
- kdb_printf("Auto activating sysrq\n");
- __sysrq_enabled = 1;
- }
+
+ toggle_save = sysrq_toggle_support(1);
kdb_trap_printk++;
handle_sysrq(*argv[1], NULL);
kdb_trap_printk--;
+ sysrq_toggle_support(toggle_save);
+
return 0;
}
#endif /* CONFIG_MAGIC_SYSRQ */
next prev parent reply other threads:[~2010-05-21 1:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-23 4:04 linux-next: build failure after merge of the kgdb tree Stephen Rothwell
2010-03-25 4:43 ` Stephen Rothwell
2010-03-25 4:59 ` Dmitry Torokhov
2010-05-21 0:21 ` Stephen Rothwell
2010-05-21 0:49 ` Jason Wessel
2010-05-21 1:09 ` Stephen Rothwell
2010-05-21 1:23 ` Dmitry Torokhov
2010-05-21 1:28 ` Jason Wessel [this message]
2010-05-24 18:17 ` Dmitry Torokhov
2010-05-24 20:04 ` Jason Wessel
2010-05-24 20:34 ` Dmitry Torokhov
2010-05-24 20:50 ` Jason Wessel
2020-05-19 14:05 Stephen Rothwell
2020-05-19 14:58 ` Doug Anderson
2020-05-19 15:52 ` Doug Anderson
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=4BF5E1D6.1090607@windriver.com \
--to=jason.wessel@windriver.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).