Changeset 0b9ac3c in mainline for kernel/generic/src

Timestamp:

2010-02-23T19:03:28Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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)
• ddi/irq.c (modified) (2 diffs)
• ipc/ipc.c (modified) (6 diffs)
• main/kinit.c (modified) (3 diffs)
• mm/as.c (modified) (1 diff)
• proc/scheduler.c (modified) (1 diff)
• 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/ddi/irq.c

@@ -74 +74 @@
 #include <synch/spinlock.h>
 #include <console/console.h>
+#include <interrupt.h>
 #include <memstr.h>
 #include <arch.h>
@@ -169 +170 @@
         irq->inr = -1;
         irq->devno = -1;
+
+        irq_initialize_arch(irq);
 }
 

kernel/generic/src/ipc/ipc.c

@@ -212 +212 @@
  *
  * @param call          Call structure to be answered.
- */
-static void _ipc_answer_free_call(call_t *call)
+ * @param selflocked    If true, then TASK->answebox is locked.
+ */
+static void _ipc_answer_free_call(call_t *call, bool selflocked)
 {
         answerbox_t *callerbox = call->callerbox;
+        bool do_lock = ((!selflocked) || callerbox != (&TASK->answerbox));
 
         call->flags |= IPC_CALL_ANSWERED;
@@ -226 +228 @@
         }
 
-        spinlock_lock(&callerbox->lock);
+        if (do_lock)
+                spinlock_lock(&callerbox->lock);
         list_append(&call->link, &callerbox->answers);
-        spinlock_unlock(&callerbox->lock);
+        if (do_lock)
+                spinlock_unlock(&callerbox->lock);
         waitq_wakeup(&callerbox->wq, WAKEUP_FIRST);
 }
@@ -244 +248 @@
         spinlock_unlock(&box->lock);
         /* Send back answer */
-        _ipc_answer_free_call(call);
+        _ipc_answer_free_call(call, false);
 }
 
@@ -261 +265 @@
         atomic_inc(&phone->active_calls);
         IPC_SET_RETVAL(call->data, err);
-        _ipc_answer_free_call(call);
+        _ipc_answer_free_call(call, false);
 }
 
@@ -300 +304 @@
                 if (call->flags & IPC_CALL_FORWARDED) {
                         IPC_SET_RETVAL(call->data, EFORWARD);
-                        _ipc_answer_free_call(call);
+                        _ipc_answer_free_call(call, false);
                 } else {
                         if (phone->state == IPC_PHONE_HUNGUP)
@@ -455 +459 @@
 
                 IPC_SET_RETVAL(call->data, EHANGUP);
-                _ipc_answer_free_call(call);
+                _ipc_answer_free_call(call, true);
         }
 }

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/mm/as.c

@@ -952 +952 @@
         if (!THREAD)
                 return AS_PF_FAULT;
-                
-        ASSERT(AS);
-
+        
+        if (!AS)
+                return AS_PF_FAULT;
+        
         mutex_lock(&AS->lock);
-        area = find_area_and_lock(AS, page);    
+        area = find_area_and_lock(AS, page);
         if (!area) {
                 /*

kernel/generic/src/proc/scheduler.c

@@ -542 +542 @@
 {
         thread_t *t;
-        int count, average, j, k = 0;
+        int count;
+        atomic_count_t average;
         unsigned int i;
+        int j;
+        int k = 0;
         ipl_t ipl;
 

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);