Merge branch 'master' into signal-dev
authorMinep <zelong56@gmail.com>
Thu, 16 Jun 2022 16:20:38 +0000 (17:20 +0100)
committerMinep <zelong56@gmail.com>
Thu, 16 Jun 2022 16:20:38 +0000 (17:20 +0100)
1  2 
lunaix-os/kernel/asm/x86/interrupt.S
lunaix-os/kernel/sched.c

Simple merge
index 8e5eecbd342c511c29c2069aab8a6ec930947f19,8c43b149d3eb761ec094269a765ba9808ca775ea..026fb515a8dbfbc34410e868de18ccad40b7b308
@@@ -60,11 -58,9 +60,11 @@@ run(struct proc_info* proc
  
      apic_done_servicing();
  
-     asm volatile("pushl %0\n"
 +    signal_dispatch();
 +
+     asm volatile("movl %0, %%eax\n"
                   "jmp soft_iret\n" ::"r"(&__current->intr_ctx)
-                  : "memory");
+                  : "eax", "memory");
  }
  
  void