Changeset bfd7aac in mainline for kernel/generic/src

Timestamp:

2010-02-17T19:19:08Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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.

Location:

kernel/generic/src

Files:

• console/console.c (modified) (1 diff)
• ddi/ddi.c (modified) (2 diffs)
• main/kinit.c (modified) (3 diffs)
• smp/ipi.c (modified) (4 diffs)

kernel/generic/src/console/console.c

@@ -45 +45 @@
 #include <ipc/irq.h>
 #include <arch.h>
+#include <panic.h>
 #include <print.h>
 #include <putchar.h>

kernel/generic/src/ddi/ddi.c

@@ -146 +146 @@
                     (btree_key_t) pf, &nodep);
                 
-                if ((!parea) || (parea->frames < pages))
+                if ((!parea) || (parea->frames < pages)) {
+                        spinlock_unlock(&parea_lock);
                         goto err;
+                }
                 
                 spinlock_unlock(&parea_lock);
@@ -153 +155 @@
         }
         
+        spinlock_unlock(&zones.lock);
 err:
-        spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
         return ENOENT;

kernel/generic/src/main/kinit.c

@@ -94 +94 @@
 void kinit(void *arg)
 {
-
 #if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
         thread_t *thread;
@@ -217 +216 @@
                 }
         }
-        
+
         /*
          * Run user tasks.
@@ -225 +224 @@
                         program_ready(&programs[i]);
         }
-        
+
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {

kernel/generic/src/smp/ipi.c

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -33 +33 @@
 /**
  * @file
- * @brief       Generic IPI interface.
+ * @brief Generic IPI interface.
  */
- 
+
 #ifdef CONFIG_SMP
 
 #include <smp/ipi.h>
 #include <config.h>
-
 
 /** Broadcast IPI message
@@ -49 +48 @@
  *
  * @bug The decision whether to actually send the IPI must be based
- *      on a different criterion. The current version has
- *      problems when some of the detected CPUs are marked
- *      disabled in machine configuration.
+ *      on a different criterion. The current version has
+ *      problems when some of the detected CPUs are marked
+ *      disabled in machine configuration.
  */
 void ipi_broadcast(int ipi)
@@ -60 +59 @@
          * - if there is only one CPU but the kernel was compiled with CONFIG_SMP
          */
-
+        
         if ((config.cpu_active > 1) && (config.cpu_active == config.cpu_count))
                 ipi_broadcast_arch(ipi);