[Xen-changelog] Merge bk://xen.bkbits.net/xeno-unstable.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1417, 2005/05/02 16:55:17-07:00, xen-ia64.adm@xxxxxxxxxx

        Merge bk://xen.bkbits.net/xeno-unstable.bk
        into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk



 xenmisc.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)


diff -Nru a/xen/arch/ia64/xenmisc.c b/xen/arch/ia64/xenmisc.c
--- a/xen/arch/ia64/xenmisc.c   2005-05-03 04:11:10 -04:00
+++ b/xen/arch/ia64/xenmisc.c   2005-05-03 04:11:10 -04:00
@@ -72,7 +72,7 @@
        return;
 }
 
-struct pt_regs *get_execution_context(void) { return ia64_task_regs(current); }
+struct pt_regs *get_cpu_user_regs(void) { return ia64_task_regs(current); }
 
 void raise_actimer_softirq(void)
 {
@@ -339,6 +339,11 @@
                //send_guest_virq(next, VIRQ_TIMER);
        load_region_regs(current);
        if (vcpu_timer_expired(current)) vcpu_pend_timer(current);
+}
+
+void continue_running(struct exec_domain *same)
+{
+    /* nothing to do */
 }
 
 void panic_domain(struct pt_regs *regs, const char *fmt, ...)

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