direct-io.hg

changeset 4524:1f457fed92df

bitkeeper revision 1.1277.1.5 (425ebd26PXABcGSvCLobVo7xCbroOg)

xenasm.S, process.c:
properly pass shared page to domain for paravirtualization
Signed-off-by: Dan Magenheimer <dan.magenheimer@hp.com>
author djm@kirby.fc.hp.com
date Thu Apr 14 18:57:42 2005 +0000 (2005-04-14)
parents 20c0d8bc45ff
children 5efd21a0b625
files xen/arch/ia64/process.c xen/arch/ia64/xenasm.S
line diff
     1.1 --- a/xen/arch/ia64/process.c	Wed Apr 13 16:17:29 2005 +0000
     1.2 +++ b/xen/arch/ia64/process.c	Thu Apr 14 18:57:42 2005 +0000
     1.3 @@ -185,9 +185,10 @@ panic_domain(regs,"psr.ic off, deliverin
     1.4  
     1.5  	regs->cr_iip = ((unsigned long) PSCB(ed,iva) + vector) & ~0xffUL;
     1.6  	regs->cr_ipsr = (regs->cr_ipsr & ~DELIVER_PSR_CLR) | DELIVER_PSR_SET;
     1.7 -// FIXME: NEED TO PASS PSCB, BUT **NOT** IN R31 WHICH IS BEING USED FOR ar.pr
     1.8 -// IN ANY CASE, PASS PINNED ADDRESS, NOT THIS ONE
     1.9 -	//regs->r31 = (unsigned long) &PSCB(ed);
    1.10 +#ifdef CONFIG_SMP
    1.11 +#error "sharedinfo doesn't handle smp yet"
    1.12 +#endif
    1.13 +	regs->r31 = &((shared_info_t *)SHAREDINFO_ADDR)->vcpu_data[0].arch;
    1.14  
    1.15  	PSCB(ed,interrupt_delivery_enabled) = 0;
    1.16  	PSCB(ed,interrupt_collection_enabled) = 0;
     2.1 --- a/xen/arch/ia64/xenasm.S	Wed Apr 13 16:17:29 2005 +0000
     2.2 +++ b/xen/arch/ia64/xenasm.S	Thu Apr 14 18:57:42 2005 +0000
     2.3 @@ -190,7 +190,7 @@ 1:
     2.4  
     2.5  	movl r22=SHAREDINFO_ADDR
     2.6  	;;
     2.7 -	movl r25=PAGE_KERNEL
     2.8 +	movl r25=PAGE_SHARED
     2.9  	;;
    2.10  	mov r21=loc5			// saved sharedinfo physical address
    2.11  	;;