ia64/xen-unstable

changeset 2981:b49a4a760280

bitkeeper revision 1.1159.170.25 (4198cc3b-yQEJ6t2KXb0BZw64jh66Q)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-ddb
author cl349@freefall.cl.cam.ac.uk
date Mon Nov 15 15:33:15 2004 +0000 (2004-11-15)
parents 02c4a1199884 43bbf6841c7f
children 9edb3993dabc 23770b4d28fc
files xen/common/keyhandler.c
line diff
     1.1 --- a/xen/common/keyhandler.c	Mon Nov 15 13:19:19 2004 +0000
     1.2 +++ b/xen/common/keyhandler.c	Mon Nov 15 15:33:15 2004 +0000
     1.3 @@ -89,7 +89,7 @@ static void dump_registers(unsigned char
     1.4      show_registers(regs); 
     1.5  }
     1.6  
     1.7 -static void halt_machine(unsigned char key)
     1.8 +static void halt_machine(unsigned char key, struct xen_regs *regs)
     1.9  {
    1.10      printk("'%c' pressed -> rebooting machine\n", key); 
    1.11      machine_restart(NULL); 
    1.12 @@ -169,7 +169,7 @@ void initialize_keytable(void)
    1.13          'q', do_task_queues, "dump task queues + guest state");
    1.14      register_keyhandler(
    1.15          'r', dump_runq,      "dump run queues");
    1.16 -    register_keyhandler(
    1.17 +    register_irq_keyhandler(
    1.18          'R', halt_machine,   "reboot machine"); 
    1.19  
    1.20  #ifndef NDEBUG