2 files changed, 3 insertions, 13 deletions

diff --git a/uisimulator/sdl/kernel.c b/uisimulator/sdl/kernel.c
index 17ca55a694..d67fb2b9f1 100644
--- a/uisimulator/sdl/kernel.c
+++ b/uisimulator/sdl/kernel.c
@@ -269,7 +269,6 @@ void queue_wait(struct event_queue *q, struct queue_event *ev)
     {
         do
         {
-            cores[CURRENT_CORE].irq_level = oldlevel;
             block_thread(&q->queue);
             oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
         }
@@ -304,7 +303,6 @@ void queue_wait_w_tmo(struct event_queue *q, struct queue_event *ev, int ticks)
 
     if (q->read == q->write && ticks > 0)
     {
-        cores[CURRENT_CORE].irq_level = oldlevel;
         block_thread_w_tmo(&q->queue, ticks);
         oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
     }
@@ -379,7 +377,6 @@ intptr_t queue_send(struct event_queue *q, long id, intptr_t data)
 
         wakeup_thread(&q->queue);
 
-        cores[CURRENT_CORE].irq_level = oldlevel;
         block_thread_no_listlock(spp);
         return thread_get_current()->retval;
     }
diff --git a/uisimulator/sdl/thread-sdl.c b/uisimulator/sdl/thread-sdl.c
index b8297072f2..d1a8e60d01 100644
--- a/uisimulator/sdl/thread-sdl.c
+++ b/uisimulator/sdl/thread-sdl.c
@@ -135,8 +135,7 @@ bool thread_sdl_init(void *param)
     running->name = "main";
     running->state = STATE_RUNNING;
     running->context.c = SDL_CreateCond();
-    cores[CURRENT_CORE].irq_level = STAY_IRQ_LEVEL;
-
+ 
     if (running->context.c == NULL)
     {
         fprintf(stderr, "Failed to create main condition variable\n");
@@ -230,15 +229,9 @@ static void remove_from_list_l(struct thread_entry **list,
     thread->l.next->l.prev = thread->l.prev;
 }
 
-static void run_blocking_ops(void)
+static inline void run_blocking_ops(void)
 {
-    int level = cores[CURRENT_CORE].irq_level;
-
-    if (level != STAY_IRQ_LEVEL)
-    {
-        cores[CURRENT_CORE].irq_level = STAY_IRQ_LEVEL;
-        set_irq_level(level);
-    }
+    set_irq_level(0);
 }
 
 struct thread_entry *thread_get_current(void)