[src/cherry-xenmp]: src/sys/arch/xen/xen Really use HYPERVISOR_block()

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72fc64741ff9
branches:  cherry-xenmp
changeset: 765648:72fc64741ff9
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Oct 22 21:16:59 2011 +0000

description:
Really use HYPERVISOR_block()

diffstat:

 sys/arch/xen/xen/clock.c |  20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)

diffs (39 lines):

diff -r 0933a5c8b07d -r 72fc64741ff9 sys/arch/xen/xen/clock.c
--- a/sys/arch/xen/xen/clock.c  Sat Oct 22 19:26:16 2011 +0000
+++ b/sys/arch/xen/xen/clock.c  Sat Oct 22 21:16:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.54.6.5 2011/10/22 19:26:16 bouyer Exp $    */
+/*     $NetBSD: clock.c,v 1.54.6.6 2011/10/22 21:16:59 bouyer Exp $    */
 
 /*
  *
@@ -29,7 +29,7 @@
 #include "opt_xen.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.54.6.5 2011/10/22 19:26:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.54.6.6 2011/10/22 21:16:59 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -552,18 +552,6 @@
 void
 idle_block(void)
 {
-#ifdef MULTIPROCESSOR
-       HYPERVISOR_yield();
-       __sti();
-#else
-       struct cpu_info *ci = curcpu();
-       int r;
-
-       r = HYPERVISOR_set_timer_op(
-           vcpu_system_time[ci->ci_cpuid] + NS_PER_TICK);
-       if (r == 0)
-               HYPERVISOR_block();
-       else
-               __sti();
-#endif
+       KASSERT(curcpu()->ci_ipending == 0);
+       HYPERVISOR_block();
 }