ia64/xen-unstable

changeset 5073:6dda721a273a

bitkeeper revision 1.1503 (428f1042Yao-1v9mZSxNem0DoJz-Yw)

Fix show_registers() show guest stack or Xen stack, not both.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Sat May 21 10:41:06 2005 +0000 (2005-05-21)
parents 5bf66e408317
children 07bd52c0f8de
files xen/arch/x86/x86_32/traps.c xen/arch/x86/x86_64/traps.c
line diff
     1.1 --- a/xen/arch/x86/x86_32/traps.c	Sat May 21 10:29:40 2005 +0000
     1.2 +++ b/xen/arch/x86/x86_32/traps.c	Sat May 21 10:41:06 2005 +0000
     1.3 @@ -78,9 +78,10 @@ void show_registers(struct cpu_user_regs
     1.4             "ss: %04lx   cs: %04lx\n",
     1.5             ds, es, fs, gs, ss, cs);
     1.6  
     1.7 -    show_stack((unsigned long *)&regs->esp);
     1.8      if ( GUEST_MODE(regs) )
     1.9          show_guest_stack();
    1.10 +    else
    1.11 +        show_stack((unsigned long *)&regs->esp);
    1.12  } 
    1.13  
    1.14  void show_page_walk(unsigned long addr)
     2.1 --- a/xen/arch/x86/x86_64/traps.c	Sat May 21 10:29:40 2005 +0000
     2.2 +++ b/xen/arch/x86/x86_64/traps.c	Sat May 21 10:41:06 2005 +0000
     2.3 @@ -23,10 +23,11 @@ void show_registers(struct cpu_user_regs
     2.4      printk("r12: %016lx   r13: %016lx   r14: %016lx   r15: %016lx\n",
     2.5             regs->r12, regs->r13, regs->r14, regs->r15);
     2.6  
     2.7 -    show_stack((unsigned long *)regs->rsp);
     2.8      if ( GUEST_MODE(regs) )
     2.9          show_guest_stack();
    2.10 -} 
    2.11 +    else
    2.12 +        show_stack((unsigned long *)regs->rsp);
    2.13 +}
    2.14  
    2.15  void show_page_walk(unsigned long addr)
    2.16  {