ia64/xen-unstable
changeset 2809:b29933b42ed1
bitkeeper revision 1.1159.147.2 (41865b310p7czMHOMPp_UCEAvKP2IA)
bad merge
bad merge
author | ach61@labyrinth.cl.cam.ac.uk |
---|---|
date | Mon Nov 01 15:50:09 2004 +0000 (2004-11-01) |
parents | a5beee8013f5 |
children | 61a55dee09d8 |
files | xen/common/keyhandler.c |
line diff
1.1 --- a/xen/common/keyhandler.c Mon Nov 01 15:36:18 2004 +0000 1.2 +++ b/xen/common/keyhandler.c Mon Nov 01 15:50:09 2004 +0000 1.3 @@ -53,7 +53,7 @@ static void show_handlers(unsigned char 1.4 static void dump_registers(unsigned char key) 1.5 { 1.6 struct xen_regs *regs = (struct xen_regs *)get_execution_context(); 1.7 - extern void show_registers(struct pt_regs *regs); 1.8 + extern void show_registers(struct xen_regs *regs); 1.9 printk("'%c' pressed -> dumping registers\n", key); 1.10 show_registers(regs); 1.11 }