Changeset 04e3d9f in mainline

Timestamp:

2010-07-02T22:37:00Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

97bdb4a

Parents:

fef504a

Message:

remove an overly bold assumption about the validity of CPU
(some interrupts and especially exceptions can occur on the CPU even before the THE→cpu pointer is configured)

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (2 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -100 +100 @@
 NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
 {
-        ASSERT(CPU);
-        
 #if (IVT_ITEMS > 0)
         ASSERT(n < IVT_ITEMS);
@@ -114 +112 @@
         
         /* Account CPU usage if it has waked up from sleep */
-        irq_spinlock_lock(&CPU->lock, false);
-        if (CPU->idle) {
-                uint64_t now = get_cycle();
-                CPU->idle_cycles += now - CPU->last_cycle;
-                CPU->last_cycle = now;
-                CPU->idle = false;
-        }
-        irq_spinlock_unlock(&CPU->lock, false);
+        if (CPU) {
+                irq_spinlock_lock(&CPU->lock, false);
+                if (CPU->idle) {
+                        uint64_t now = get_cycle();
+                        CPU->idle_cycles += now - CPU->last_cycle;
+                        CPU->last_cycle = now;
+                        CPU->idle = false;
+                }
+                irq_spinlock_unlock(&CPU->lock, false);
+        }
         
         uint64_t begin_cycle = get_cycle();