Merge branch 'qemu_netduino2' into olimex-stm32-h407

2 files changed, 6 insertions, 7 deletions

diff --git a/src/thread.c b/src/thread.c
index bb5ddc4..55efbe2 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -410,17 +410,15 @@ static void
 thread_runq_tick(struct thread_runq *runq)
 {
     struct thread_list *list;
+    unsigned int priority;
 
     assert(!cpu_intr_enabled());
     assert(!thread_preempt_enabled());
 
-    if (runq->current == runq->idle) {
-        return;
-    }
-
-    list = thread_runq_get_list(runq, runq->current->priority);
+    priority = runq->current->priority;
+    list = thread_runq_get_list(runq, priority);
 
-    if (thread_list_singular(list)) {
+    if (thread_list_singular(list) && (priority != THREAD_IDLE_PRIORITY)) {
         return;
     }
 
diff --git a/src/uart.c b/src/uart.c
index c61a1c3..6255249 100644
--- a/src/uart.c
+++ b/src/uart.c
@@ -169,7 +169,8 @@ uart_write(uint8_t byte)
 int
 uart_read(uint8_t *byte)
 {
-    int primask, error;
+    uint32_t primask;
+    int error;
 
     primask = thread_preempt_disable_intr_save();