ia64/xen-unstable

changeset 3831:2bd5457fa15e

bitkeeper revision 1.1203 (421096dcaYyLUeJDWzUpv9mpMfjHfQ)

Merge cleanups.

Signed-off-by: michael.fetterman@cl.cam.ac.uk
author mafetter@fleming.research
date Mon Feb 14 12:17:32 2005 +0000 (2005-02-14)
parents f9224ed982ae
children beb89e8da5a2 e2434b9a0f43
files xen/arch/x86/traps.c
line diff
     1.1 --- a/xen/arch/x86/traps.c	Mon Feb 14 12:09:23 2005 +0000
     1.2 +++ b/xen/arch/x86/traps.c	Mon Feb 14 12:17:32 2005 +0000
     1.3 @@ -286,7 +286,7 @@ asmlinkage int do_page_fault(struct xen_
     1.4               ((regs->error_code & 3) == 3) && /* write-protection fault */
     1.5               ptwr_do_page_fault(addr) )
     1.6          {
     1.7 -            if ( unlikely(shadow_mode(d)) )
     1.8 +            if ( unlikely(shadow_mode_enabled(d)) )
     1.9                  (void)shadow_fault(addr, regs->error_code);
    1.10              UNLOCK_BIGLOCK(d);
    1.11              return EXCRET_fault_fixed;
    1.12 @@ -294,7 +294,7 @@ asmlinkage int do_page_fault(struct xen_
    1.13          UNLOCK_BIGLOCK(d);
    1.14      }
    1.15  
    1.16 -    if ( unlikely(shadow_mode(d)) && 
    1.17 +    if ( unlikely(shadow_mode_enabled(d)) && 
    1.18           (addr < PAGE_OFFSET) && shadow_fault(addr, regs->error_code) )
    1.19          return EXCRET_fault_fixed;
    1.20  
    1.21 @@ -330,7 +330,7 @@ asmlinkage int do_page_fault(struct xen_
    1.22      if ( likely((fixup = search_exception_table(regs->eip)) != 0) )
    1.23      {
    1.24          perfc_incrc(copy_user_faults);
    1.25 -        if ( !shadow_mode(d) )
    1.26 +        if ( !shadow_mode_enabled(d) )
    1.27              DPRINTK("Page fault: %p -> %p\n", regs->eip, fixup);
    1.28          regs->eip = fixup;
    1.29          return 0;