direct-io.hg

changeset 1442:089bd7abf02e

bitkeeper revision 1.942 (40c6bf6fRA7er6A3LJKZCdJydIuc2w)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno-blk-restart.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Jun 09 07:42:39 2004 +0000 (2004-06-09)
parents 2a1ade2f1f48 9ca65dc5f7af
children 180c1407b64f
files xen/arch/i386/traps.c
line diff
     1.1 --- a/xen/arch/i386/traps.c	Tue Jun 08 13:48:30 2004 +0000
     1.2 +++ b/xen/arch/i386/traps.c	Wed Jun 09 07:42:39 2004 +0000
     1.3 @@ -252,7 +252,7 @@ asmlinkage void do_int3(struct pt_regs *
     1.4      struct guest_trap_bounce *gtb = guest_trap_bounce+smp_processor_id();
     1.5      trap_info_t *ti;
     1.6  
     1.7 -    if ( pdb_handle_exception(3, regs) == 0 )
     1.8 +    if ( pdb_initialized && pdb_handle_exception(3, regs) == 0 )
     1.9          return;
    1.10      if ( (regs->xcs & 3) != 3 )
    1.11      {
    1.12 @@ -377,7 +377,7 @@ asmlinkage void do_page_fault(struct pt_
    1.13  #endif
    1.14      }
    1.15  
    1.16 -    if (pdb_page_fault_possible)
    1.17 +    if (pdb_page_fault_possible)                 /* implicit pdb_initialized */
    1.18      {
    1.19          pdb_page_fault = 1;
    1.20  	/* make eax & edx valid to complete the instruction */