more sched.c diff reduction

diff --git a/platform/baremetal/sched.c b/platform/baremetal/sched.c
index c905adfe9d52dc5cb13febe1f90e56fb345fa1aa..ba814abb303435e1d68c226939429333b0d8cb7d 100644 (file)
--- a/platform/baremetal/sched.c
+++ b/platform/baremetal/sched.c
@@ -192,6 +192,18 @@ bmk_sched(void)
        prev = bmk_sched_current();
        flags = bmk_platform_splhigh();
 
+#if 0
+       /* XXX */
+       if (_minios_in_hypervisor_callback) {
+               minios_printk("Must not call schedule() from a callback\n");
+               BUG();
+       }
+#endif
+
+       if (flags) {
+               bmk_platform_halt("Must not call sched() with IRQs disabled\n");
+       }
+
        /* could do time management a bit better here */
        do {
                bmk_time_t tm, wakeup;

diff --git a/platform/xen/xen/sched.c b/platform/xen/xen/sched.c
index 5becf2afe8a6c49ae611e02caa582622d2da7228..754113c39de7b968f5bd613e0bc684f616a26f22 100644 (file)
--- a/platform/xen/xen/sched.c
+++ b/platform/xen/xen/sched.c
@@ -196,13 +196,16 @@ bmk_sched(void)
        prev = bmk_sched_current();
        flags = bmk_platform_splhigh();
 
+#if 0
+       /* XXX */
        if (_minios_in_hypervisor_callback) {
                minios_printk("Must not call schedule() from a callback\n");
                BUG();
        }
+#endif
+
        if (flags) {
-               minios_printk("Must not call schedule() with IRQs disabled\n");
-               BUG();
+               bmk_platform_halt("Must not call sched() with IRQs disabled\n");
        }
 
        /* could do time management a bit better here */