Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3bc3189 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

xen: fix build when SYSRQ is disabled 



Fix build error when CONFIG_MAGIC_SYSRQ is not enabled:

drivers/xen/manage.c:223: error: implicit declaration of function 'handle_sysrq'

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Acked-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a321cedb

drivers/xen/manage.c

+9 −5
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ static void shutdown_handler(struct xenbus_watch *watch, 
	kfree(str);

}



#ifdef CONFIG_MAGIC_SYSRQ

static void sysrq_handler(struct xenbus_watch *watch, const char **vec,

			  unsigned int len)

{
@@ -214,15 +215,16 @@ static void sysrq_handler(struct xenbus_watch *watch, const char **vec, 
		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)

{
@@ -234,11 +236,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;

}