ia64/xen-unstable
changeset 3777:c37c674174f7
bitkeeper revision 1.1172 (420b99066Xfg-68mYeFJdp4BIxo_wQ)
Merge douglas.cl.cam.ac.uk:/local/scratch/sos22/xendbng/xeno.bk
into douglas.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/crashdb.bk
Signed-off-by: sos22@cl.cam.ac.uk
Merge douglas.cl.cam.ac.uk:/local/scratch/sos22/xendbng/xeno.bk
into douglas.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/crashdb.bk
Signed-off-by: sos22@cl.cam.ac.uk
author | sos22@douglas.cl.cam.ac.uk |
---|---|
date | Thu Feb 10 17:25:26 2005 +0000 (2005-02-10) |
parents | 09ef8bf5a916 d9449b5a8d64 |
children | dd0558f4a5e9 1d13ed9582e0 |
files | xen/common/keyhandler.c xen/include/asm-x86/debugger.h |
line diff
1.1 --- a/xen/common/keyhandler.c Thu Feb 10 17:23:56 2005 +0000 1.2 +++ b/xen/common/keyhandler.c Thu Feb 10 17:25:26 2005 +0000 1.3 @@ -149,7 +149,7 @@ extern void perfc_reset(unsigned char ke 1.4 1.5 void do_debug_key(unsigned char key, struct xen_regs *regs) 1.6 { 1.7 - debugger_trap_fatal(0xf001, regs); 1.8 + (void)debugger_trap_fatal(0xf001, regs); 1.9 asm volatile ("nop"); /* Prevent the compiler doing tail call 1.10 optimisation, as that confuses xendbg a 1.11 bit. */
2.1 --- a/xen/include/asm-x86/debugger.h Thu Feb 10 17:23:56 2005 +0000 2.2 +++ b/xen/include/asm-x86/debugger.h Thu Feb 10 17:25:26 2005 +0000 2.3 @@ -123,7 +123,7 @@ static inline int debugger_trap_fatal( 2.4 2.5 #define debugger_trap_entry(_v, _r) (0) 2.6 #define debugger_trap_fatal(_v, _r) (0) 2.7 -#define debugger_trap_immediate() () 2.8 +#define debugger_trap_immediate() 2.9 2.10 #endif 2.11