On 03/25/2010 11:29 AM, Randy Dunlap wrote:
From: Randy Dunlap<randy.dunlap@xxxxxxxxxx>
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@xxxxxxxxxx>
J
Signed-off-by: Randy Dunlap<randy.dunlap@xxxxxxxxxx>
Cc: Jeremy Fitzhardinge<jeremy@xxxxxxxxxxxxx>
Cc: Chris Wright<chrisw@xxxxxxxxxxxx>
---
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
