ia64/xen-unstable

changeset 3694:75266d5ca7ca

bitkeeper revision 1.1159.212.109 (42078e8e1-3RnmEqHbanC69txgXoZQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author iap10@labyrinth.cl.cam.ac.uk
date Mon Feb 07 15:51:42 2005 +0000 (2005-02-07)
parents f38875b9c89f bbe2a077f3b5
children ff48344d34df
files linux-2.6.10-xen-sparse/arch/xen/i386/mm/fault.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/mm/fault.c	Mon Feb 07 14:48:48 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/fault.c	Mon Feb 07 15:51:42 2005 +0000
     1.3 @@ -229,7 +229,9 @@ fastcall void do_page_fault(struct pt_re
     1.4  	/* Set the "privileged fault" bit to something sane. */
     1.5  	error_code &= 3;
     1.6  	error_code |= (regs->xcs & 2) << 1;
     1.7 -
     1.8 +	if (regs->eflags & X86_EFLAGS_VM)
     1.9 +		error_code |= 4;
    1.10 +		
    1.11   	if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
    1.12   					SIGSEGV) == NOTIFY_STOP)
    1.13   		return;