Changeset 26d3ae2 in mainline

Timestamp:

2010-02-16T16:36:48Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eda6e09

Parents:

dabdd1a

Message:

cleanup ipi-related stuff

Location:

kernel

Files:

• arch/amd64/src/debugger.c (modified) (2 diffs)
• arch/mips32/include/smp/dorder.h (deleted)
• arch/mips32/src/smp/dorder.c (modified) (2 diffs)
• generic/include/smp/ipi.h (modified) (2 diffs)
• generic/src/smp/ipi.c (modified) (4 diffs)

kernel/arch/amd64/src/debugger.c

@@ -201 +201 @@
 
         /* Send IPI */
-#ifdef CONFIG_SMP
 //      ipi_broadcast(VECTOR_DEBUG_IPI);
-#endif  
 
         return curidx;
@@ -262 +260 @@
         spinlock_unlock(&bkpoint_lock);
         interrupts_restore(ipl);
-#ifdef CONFIG_SMP
-//      ipi_broadcast(VECTOR_DEBUG_IPI);        
-#endif
+//      ipi_broadcast(VECTOR_DEBUG_IPI);
 }
 

kernel/arch/mips32/src/smp/dorder.c

@@ -33 +33 @@
  */
 
-#include <arch/smp/dorder.h>
+#include <smp/ipi.h>
+
+#ifdef CONFIG_SMP
 
 #define MSIM_DORDER_ADDRESS  0xB0000004
@@ -39 +41 @@
 void ipi_broadcast_arch(int ipi)
 {
-#ifdef CONFIG_SMP
         *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
+}
+
 #endif
-}
 
 /** @}

kernel/generic/include/smp/ipi.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -37 +37 @@
 
 #ifdef CONFIG_SMP
-extern void ipi_broadcast(int ipi);
-extern void ipi_broadcast_arch(int ipi);
+
+extern void ipi_broadcast(int);
+extern void ipi_broadcast_arch(int);
+
 #else
-#define ipi_broadcast(x)        ;
+
+        #define ipi_broadcast(ipi)
+
 #endif /* CONFIG_SMP */
 

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