aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>2004-11-15 15:32:46 +0000
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>2004-11-15 15:32:46 +0000
commit58faa491519d028756992e15778bb2d97e82bf2f (patch)
treeb55900c2daa83a1cabe842635af8bab989dcaffe
parent2ccd2269e200b64c9bef019e73966d9ea5bae6e0 (diff)
downloadxen-58faa491519d028756992e15778bb2d97e82bf2f.tar.gz
xen-58faa491519d028756992e15778bb2d97e82bf2f.tar.bz2
xen-58faa491519d028756992e15778bb2d97e82bf2f.zip
bitkeeper revision 1.1159.173.1 (4198cc1etdf5hNRh765kjOv76JOjog)
Run "reboot machine" keyhandler from interrupt context.
-rw-r--r--xen/common/keyhandler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index d6eb85250b..a5cf77aa57 100644
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -89,7 +89,7 @@ static void dump_registers(unsigned char key, struct xen_regs *regs)
show_registers(regs);
}
-static void halt_machine(unsigned char key)
+static void halt_machine(unsigned char key, struct xen_regs *regs)
{
printk("'%c' pressed -> rebooting machine\n", key);
machine_restart(NULL);
@@ -169,7 +169,7 @@ void initialize_keytable(void)
'q', do_task_queues, "dump task queues + guest state");
register_keyhandler(
'r', dump_runq, "dump run queues");
- register_keyhandler(
+ register_irq_keyhandler(
'R', halt_machine, "reboot machine");
#ifndef NDEBUG