ia64/xen-unstable

changeset 5425:4bcb6d1a8fc5

bitkeeper revision 1.1705.1.14 (42a9a5deJbK8YHFnSDDIGurt2uATXA)

Manual merge.
author kaf24@firebug.cl.cam.ac.uk
date Fri Jun 10 14:38:22 2005 +0000 (2005-06-10)
parents 61f0cf22d5cd 02d442d39367
children 957e3573240e
files xen/arch/x86/traps.c
line diff
     1.1 --- a/xen/arch/x86/traps.c	Fri Jun 10 13:49:33 2005 +0000
     1.2 +++ b/xen/arch/x86/traps.c	Fri Jun 10 14:38:22 2005 +0000
     1.3 @@ -423,6 +423,7 @@ asmlinkage int do_page_fault(struct cpu_
     1.4          }
     1.5  
     1.6          if ( (addr < HYPERVISOR_VIRT_START) &&
     1.7 +             KERNEL_MODE(v, regs) &&
     1.8               ((regs->error_code & 3) == 3) && /* write-protection fault */
     1.9               ptwr_do_page_fault(d, addr) )
    1.10          {