Changeset 8ff0bd2 in mainline for kernel/generic/src/ddi/irq.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/ddi/irq.c (modified) (1 diff)

kernel/generic/src/ddi/irq.c

@@ -275 +275 @@
 {
         /*
-         * If the kernel console is silenced,
-         * then try first the uspace handlers,
-         * eventually fall back to kernel handlers.
+         * If the kernel console override is on,
+         * then try first the kernel handlers
+         * and eventually fall back to uspace
+         * handlers.
          *
-         * If the kernel console is active,
-         * then do it the other way around.
+         * In the usual case the uspace handlers
+         * have precedence.
          */
-        if (silent) {
-                irq_t *irq = irq_dispatch_and_lock_uspace(inr);
+        
+        if (console_override) {
+                irq_t *irq = irq_dispatch_and_lock_kernel(inr);
                 if (irq)
                         return irq;
                 
-                return irq_dispatch_and_lock_kernel(inr);
-        }
-        
-        irq_t *irq = irq_dispatch_and_lock_kernel(inr);
+                return irq_dispatch_and_lock_uspace(inr);
+        }
+        
+        irq_t *irq = irq_dispatch_and_lock_uspace(inr);
         if (irq)
                 return irq;
         
-        return irq_dispatch_and_lock_uspace(inr);
+        return irq_dispatch_and_lock_kernel(inr);
 }