1.1 --- a/xen/arch/ia64/vmx/vmx_process.c	Fri May 11 13:15:53 2007 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmx_process.c	Mon May 14 11:13:24 2007 -0600
     1.3 @@ -153,7 +153,7 @@ vmx_ia64_handle_break (unsigned long ifa
     1.4  
     1.5      perfc_incr(vmx_ia64_handle_break);
     1.6  #ifdef CRASH_DEBUG
     1.7 -    if ((iim == 0 || iim == CDB_BREAK_NUM) && !user_mode(regs) &&
     1.8 +    if ((iim == 0 || iim == CDB_BREAK_NUM) && !guest_mode(regs) &&
     1.9          IS_VMM_ADDRESS(regs->cr_iip)) {
    1.10          if (iim == 0)
    1.11              show_registers(regs);

     2.1 --- a/xen/arch/ia64/xen/faults.c	Fri May 11 13:15:53 2007 -0600
     2.2 +++ b/xen/arch/ia64/xen/faults.c	Mon May 14 11:13:24 2007 -0600
     2.3 @@ -507,7 +507,7 @@ ia64_handle_break(unsigned long ifa, str
     2.4  		do_ssc(vcpu_get_gr(current, 36), regs);
     2.5  	}
     2.6  #ifdef CRASH_DEBUG
     2.7 -	else if ((iim == 0 || iim == CDB_BREAK_NUM) && !user_mode(regs)) {
     2.8 +	else if ((iim == 0 || iim == CDB_BREAK_NUM) && !guest_mode(regs)) {
     2.9  		if (iim == 0)
    2.10  			show_registers(regs);
    2.11  		debugger_trap_fatal(0 /* don't care */ , regs);