Changes in kernel/arch/ia32/src/interrupt.c [da1bafb:a000878c] in mainline

File:

• kernel/arch/ia32/src/interrupt.c (modified) (10 diffs)

kernel/arch/ia32/src/interrupt.c

@@ -94 +94 @@
 {
         fault_if_from_uspace(istate, "Unserviced interrupt: %d.", n);
-        
+
         decode_istate(istate);
         panic("Unserviced interrupt: %d.", n);
@@ -102 +102 @@
 {
         fault_if_from_uspace(istate, "Divide error.");
-        
+
         decode_istate(istate);
         panic("Divide error.");
@@ -111 +111 @@
 {
         if (TASK) {
-                irq_spinlock_lock(&TASK->lock, false);
-                size_t ver = TASK->arch.iomapver;
-                irq_spinlock_unlock(&TASK->lock, false);
+                size_t ver;
                 
+                spinlock_lock(&TASK->lock);
+                ver = TASK->arch.iomapver;
+                spinlock_unlock(&TASK->lock);
+        
                 if (CPU->arch.iomapver_copy != ver) {
                         /*
@@ -128 +130 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-        
+
         decode_istate(istate);
         panic("General protection fault.");
@@ -136 +138 @@
 {
         fault_if_from_uspace(istate, "Stack fault.");
-        
+
         decode_istate(istate);
         panic("Stack fault.");
@@ -144 +146 @@
 {
         uint32_t mxcsr;
-        asm volatile (
+        asm (
                 "stmxcsr %[mxcsr]\n"
                 : [mxcsr] "=m" (mxcsr)
         );
-        
         fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx.",
             (unative_t) mxcsr);
@@ -157 +158 @@
 }
 
-static void nm_fault(int n __attribute__((unused)),
-    istate_t *istate __attribute__((unused)))
-{
-#ifdef CONFIG_FPU_LAZY
+static void nm_fault(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
+{
+#ifdef CONFIG_FPU_LAZY     
         scheduler_fpu_lazy_request();
 #else
@@ -169 +169 @@
 
 #ifdef CONFIG_SMP
-static void tlb_shootdown_ipi(int n __attribute__((unused)),
-    istate_t *istate __attribute__((unused)))
+static void tlb_shootdown_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
         trap_virtual_eoi();
@@ -192 +191 @@
                  * The IRQ handler was found.
                  */
-                
+                 
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
@@ -199 +198 @@
                 }
                 irq->handler(irq);
-                irq_spinlock_unlock(&irq->lock, false);
+                spinlock_unlock(&irq->lock);
         } else {
                 /*