From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>, Chris Wright <chrisw@sous-sol.org>
Subject: Re: [PATCH 3/3 -next] xen: fix build when SYSRQ is disabled
Date: Thu, 25 Mar 2010 11:40:00 -0700 [thread overview]
Message-ID: <4BABAE00.8010606@goop.org> (raw)
In-Reply-To: <4BABAB8C.2070104@oracle.com>
On 03/25/2010 11:29 AM, Randy Dunlap wrote:
> From: Randy Dunlap<randy.dunlap@oracle.com>
>
> Fix build error when CONFIG_MAGIC_SYSRQ is not enabled:
>
> drivers/xen/manage.c:223: error: implicit declaration of function 'handle_sysrq'
>
Yep, looks fine.
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
J
> Signed-off-by: Randy Dunlap<randy.dunlap@oracle.com>
> Cc: Jeremy Fitzhardinge<jeremy@xensource.com>
> Cc: Chris Wright<chrisw@sous-sol.org>
> ---
> drivers/xen/manage.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> --- linux-next-20100325.orig/drivers/xen/manage.c
> +++ linux-next-20100325/drivers/xen/manage.c
> @@ -194,6 +194,7 @@ static void shutdown_handler(struct xenb
> kfree(str);
> }
>
> +#ifdef CONFIG_MAGIC_SYSRQ
> static void sysrq_handler(struct xenbus_watch *watch, const char **vec,
> unsigned int len)
> {
> @@ -223,15 +224,16 @@ static void sysrq_handler(struct xenbus_
> handle_sysrq(sysrq_key, NULL);
> }
>
> -static struct xenbus_watch shutdown_watch = {
> - .node = "control/shutdown",
> - .callback = shutdown_handler
> -};
> -
> static struct xenbus_watch sysrq_watch = {
> .node = "control/sysrq",
> .callback = sysrq_handler
> };
> +#endif
> +
> +static struct xenbus_watch shutdown_watch = {
> + .node = "control/shutdown",
> + .callback = shutdown_handler
> +};
>
> static int setup_shutdown_watcher(void)
> {
> @@ -243,11 +245,13 @@ static int setup_shutdown_watcher(void)
> return err;
> }
>
> +#ifdef CONFIG_MAGIC_SYSRQ
> err = register_xenbus_watch(&sysrq_watch);
> if (err) {
> printk(KERN_ERR "Failed to set sysrq watcher\n");
> return err;
> }
> +#endif
>
> return 0;
> }
>
prev parent reply other threads:[~2010-03-25 18:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-25 6:38 linux-next: Tree for March 25 Stephen Rothwell
2010-03-25 18:29 ` [PATCH 1/3 -next] drm: fix build error when SYSRQ is disabled Randy Dunlap
2010-03-25 18:29 ` [PATCH 2/3 -next] usb: fix serial build " Randy Dunlap
2010-03-25 18:29 ` [PATCH 3/3 -next] xen: fix " Randy Dunlap
2010-03-25 18:40 ` Jeremy Fitzhardinge [this message]
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=4BABAE00.8010606@goop.org \
--to=jeremy@goop.org \
--cc=akpm@osdl.org \
--cc=chrisw@sous-sol.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--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).