[Xen-changelog] xenasm.S, process.c:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1277.1.5, 2005/04/14 12:57:42-06:00, djm@xxxxxxxxxxxxxxx

        xenasm.S, process.c:
          properly pass shared page to domain for paravirtualization
        Signed-off-by: Dan Magenheimer <dan.magenheimer@xxxxxx>



 process.c |    7 ++++---
 xenasm.S  |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)


diff -Nru a/xen/arch/ia64/process.c b/xen/arch/ia64/process.c
--- a/xen/arch/ia64/process.c   2005-04-20 05:03:30 -04:00
+++ b/xen/arch/ia64/process.c   2005-04-20 05:03:30 -04:00
@@ -185,9 +185,10 @@
 
        regs->cr_iip = ((unsigned long) PSCB(ed,iva) + vector) & ~0xffUL;
        regs->cr_ipsr = (regs->cr_ipsr & ~DELIVER_PSR_CLR) | DELIVER_PSR_SET;
-// FIXME: NEED TO PASS PSCB, BUT **NOT** IN R31 WHICH IS BEING USED FOR ar.pr
-// IN ANY CASE, PASS PINNED ADDRESS, NOT THIS ONE
-       //regs->r31 = (unsigned long) &PSCB(ed);
+#ifdef CONFIG_SMP
+#error "sharedinfo doesn't handle smp yet"
+#endif
+       regs->r31 = &((shared_info_t *)SHAREDINFO_ADDR)->vcpu_data[0].arch;
 
        PSCB(ed,interrupt_delivery_enabled) = 0;
        PSCB(ed,interrupt_collection_enabled) = 0;
diff -Nru a/xen/arch/ia64/xenasm.S b/xen/arch/ia64/xenasm.S
--- a/xen/arch/ia64/xenasm.S    2005-04-20 05:03:30 -04:00
+++ b/xen/arch/ia64/xenasm.S    2005-04-20 05:03:30 -04:00
@@ -190,7 +190,7 @@
 
        movl r22=SHAREDINFO_ADDR
        ;;
-       movl r25=PAGE_KERNEL
+       movl r25=PAGE_SHARED
        ;;
        mov r21=loc5                    // saved sharedinfo physical address
        ;;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog